Skip to content
This repository
Browse code

Merge pull request #620 from tigrang/2.1

Fixed bug in Router::normalize()
  • Loading branch information...
commit d98c087cb0a7c45178e7c25775d1087d991a37a6 2 parents 7846254 + 49eac06
Mark Story authored April 21, 2012

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  lib/Cake/Routing/Router.php
3  lib/Cake/Routing/Router.php
@@ -1014,7 +1014,8 @@ public static function reverse($params, $full = false) {
1014 1014
 	public static function normalize($url = '/') {
1015 1015
 		if (is_array($url)) {
1016 1016
 			$url = Router::url($url);
1017  
-		} elseif (preg_match('/^[a-z\-]+:\/\//', $url)) {
  1017
+		}
  1018
+		if (preg_match('/^[a-z\-]+:\/\//', $url)) {
1018 1019
 			return $url;
1019 1020
 		}
1020 1021
 		$request = Router::getRequest();

0 notes on commit d98c087

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