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

…ixes #1441
cakephp · Jan 12, 2011 · f893e3b · f893e3b
1 parent 4f94b71
commit f893e3b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/cake/console/templates/default/classes/fixture.ctp b/cake/console/templates/default/classes/fixture.ctp
@@ -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): ?>

diff --git a/cake/console/templates/default/classes/test.ctp b/cake/console/templates/default/classes/test.ctp
@@ -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;?>');
 

diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
@@ -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;

diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
@@ -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');