Fix a few small formatting flubs.

Refs #5631
cakephp · Jan 13, 2015 · c636777 · c636777
1 parent 8ce041d
commit c636777
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Database/Type/DateTimeType.php b/src/Database/Type/DateTimeType.php
@@ -123,15 +123,21 @@ public function marshal($value)
         $format = '';
         if (
             isset($value['year'], $value['month'], $value['day']) &&
-            (is_numeric($value['year']) & is_numeric($value['month']) && is_numeric($value['day']))
+            (is_numeric($value['year']) && is_numeric($value['month']) && is_numeric($value['day']))
         ) {
             $format .= sprintf('%d-%02d-%02d', $value['year'], $value['month'], $value['day']);
         }
 
         if (isset($value['meridian'])) {
             $value['hour'] = strtolower($value['meridian']) === 'am' ? $value['hour'] : $value['hour'] + 12;
         }
-        $format .= sprintf('%02d:%02d:%02d', $value['hour'], $value['minute'], $value['second']);
+        $format .= sprintf(
+            '%s%02d:%02d:%02d',
+            empty($format) ? '' : ' ',
+            $value['hour'],
+            $value['minute'],
+            $value['second']
+        );
 
         return new $class($format);
     }