Merge pull request #620 from tigrang/2.1

Fixed bug in Router::normalize()
This commit is contained in:
Mark Story 2012-04-21 18:40:57 -07:00
commit d98c087cb0

View file

@ -1014,7 +1014,8 @@ class Router {
public static function normalize($url = '/') {
if (is_array($url)) {
$url = Router::url($url);
} elseif (preg_match('/^[a-z\-]+:\/\//', $url)) {
}
if (preg_match('/^[a-z\-]+:\/\//', $url)) {
return $url;
}
$request = Router::getRequest();