Skip to content
This repository
Browse code

Forgot to include complete patch in last commit :(

Note: It's not good to commit while watching tv
  • Loading branch information...
commit 2a90baae0cc6b9ab5bafa2d223dee3d02734581b 1 parent d13deb7
José Lorenzo Rodríguez authored June 09, 2012

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  lib/Cake/Utility/CakeTime.php
6  lib/Cake/Utility/CakeTime.php
@@ -949,10 +949,10 @@ public static function format($date, $format = null, $default = false, $timezone
949 949
 		$_time = is_numeric($time) ? false : self::fromString($date, $timezone);
950 950
 
951 951
 		if (is_numeric($_time) && $time === false) {
952  
-			return self::i18nFormat($_time, $format, $invalid, $timezone);
  952
+			return self::i18nFormat($_time, $format, $default, $timezone);
953 953
 		}
954  
-		if ($time === false && $invalid !== false) {
955  
-			return $invalid;
  954
+		if ($time === false && $default !== false) {
  955
+			return $default;
956 956
 		}
957 957
 		return date($date, $time);
958 958
 	}

0 notes on commit 2a90baa

Please sign in to comment.
Something went wrong with that request. Please try again.