Forgot to include complete patch in last commit :(

Note: It's not good to commit while watching tv
cakephp · Jun 9, 2012 · 2a90baa · 2a90baa
1 parent d13deb7
commit 2a90baa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
@@ -949,10 +949,10 @@ public static function format($date, $format = null, $default = false, $timezone
 		$_time = is_numeric($time) ? false : self::fromString($date, $timezone);
 
 		if (is_numeric($_time) && $time === false) {
-			return self::i18nFormat($_time, $format, $invalid, $timezone);
+			return self::i18nFormat($_time, $format, $default, $timezone);
 		}
-		if ($time === false && $invalid !== false) {
-			return $invalid;
+		if ($time === false && $default !== false) {
+			return $default;
 		}
 		return date($date, $time);
 	}