Permalink
Browse files

Applying patch from 'ryandesign' fixing incorrect datetime formats. F…

…ixes #1441
  • Loading branch information...
1 parent 4f94b71 commit f893e3b63b86761366334bcba71ea4b02b0d5a61 @markstory markstory committed Jan 12, 2011
@@ -21,7 +21,7 @@
*/
?>
<?php echo '<?php' . "\n"; ?>
-/* <?php echo $model; ?> Fixture generated on: <?php echo date('Y-m-d H:m:s') . " : ". time(); ?> */
+/* <?php echo $model; ?> Fixture generated on: <?php echo date('Y-m-d H:i:s') . " : ". time(); ?> */
class <?php echo $model; ?>Fixture extends CakeTestFixture {
var $name = '<?php echo $model; ?>';
<?php if ($table): ?>
@@ -19,7 +19,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
echo "<?php\n";
-echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n";
+echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n";
?>
App::import('<?php echo $type; ?>', '<?php echo $plugin . $className;?>');
@@ -379,7 +379,7 @@ function write($object, $options = array()) {
$File =& new File($path . DS . $file, true);
$header = '$Id';
- $content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
+ $content = "<?php \n/* {$name} schema generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n{$out}?>";
$content = $File->prepare($content);
if ($File->write($content)) {
return $content;
@@ -1586,7 +1586,6 @@ function testSaveHabtm() {
);
$TestModel->save($data);
$result = $TestModel->read(null, 1);
- $time = date('Y-M-D H:i:s');
$expected = array(4, 5);
$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
$expected = array('new record', 'new record');

0 comments on commit f893e3b

Please sign in to comment.