Fix notice error when there are no requests.

cakephp · Apr 5, 2012 · 8497677 · 8497677
1 parent 1cc5206
commit 8497677
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -617,7 +617,8 @@ public static function popRequest() {
  */
 	public static function getRequest($current = false) {
 		if ($current) {
-			return self::$_requests[count(self::$_requests) - 1];
+			$i = count(self::$_requests) - 1;
+			return isset(self::$_requests[$i]) ? self::$_requests[$i] : null;
 		}
 		return isset(self::$_requests[0]) ? self::$_requests[0] : null;
 	}