Merge pull request #31 from antshater/fix_dates

Поправлен баг с датами
xxxcoltxxx · Apr 7, 2016 · f1fadad · f1fadad
2 parents c14215f + 89411ba
commit f1fadad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/GridTable.php b/src/GridTable.php
@@ -92,7 +92,7 @@ private function mapDataWithTemplates($data, $templates)
             foreach ($templates as $cell_name => $viewFunc) {
 
                 if (in_array($cell_name, $this->data_provider->getDates())){
-                    if (! $item->{$cell_name} instanceof Carbon){
+                    if ($item->{$cell_name} && !$item->{$cell_name} instanceof Carbon){
                         $item->{$cell_name} = \Carbon\Carbon::parse($item->{$cell_name})->format($this->data_provider->getDateFormat());
                     }
                 }