Supporting %e in windows. Fixes cakephp#1510.

benmurden · Feb 6, 2011 · f2a4b1e · f2a4b1e
1 parent 8d5e68d
commit f2a4b1e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
@@ -79,6 +79,15 @@ function __translateSpecifier($specifier) {
 				return sprintf("%02d", date('Y', $this->__time) / 100);
 			case 'D':
 				return '%m/%d/%y';
+			case 'e':
+				if (DS === '/') {
+					return '%e';
+				}
+				$day = date('j', $this->__time);
+				if ($day < 10) {
+					$day = ' ' . $day;
+				}
+				return $day;
 			case 'eS' :
 				return date('jS', $this->__time);
 			case 'b':

diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -731,6 +731,14 @@ function testConvertSpecifiers() {
 		$expected = 4;
 		$this->assertEqual($result, $expected);
 
+		$result = $this->Time->convertSpecifiers('%e', $time);
+		$expected = '14';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%e', strtotime('2011-01-01'));
+		$expected = ' 1';
+		$this->assertEqual($result, $expected);
+
 		$result = $this->Time->convertSpecifiers('%x', $time);
 		$expected = '%d/%m/%y';
 		$this->assertEqual($result, $expected);