From df28a0d5a24390c9018584fd29bffa855cd9a86f Mon Sep 17 00:00:00 2001 From: ADmad Date: Mon, 11 Aug 2014 23:22:08 +0530 Subject: [PATCH] Minor optimization. --- src/Routing/Router.php | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/Routing/Router.php b/src/Routing/Router.php index 7dc4dff15f4..b75c42816ee 100644 --- a/src/Routing/Router.php +++ b/src/Routing/Router.php @@ -502,22 +502,6 @@ public static function url($url = null, $full = false) { static::_loadRoutes(); } - $urlType = gettype($url); - $plainString = false; - - if ($urlType === 'string') { - $plainString = ( - strpos($url, 'javascript:') === 0 || - strpos($url, 'mailto:') === 0 || - strpos($url, 'tel:') === 0 || - strpos($url, 'sms:') === 0 || - strpos($url, '#') === 0 || - strpos($url, '?') === 0 || - strpos($url, '//') === 0 || - strpos($url, '://') !== false - ); - } - $params = array( 'plugin' => null, 'controller' => null, @@ -542,7 +526,7 @@ public static function url($url = null, $full = false) { $output = static::fullBaseUrl() . $base . $output; } return $output; - } elseif ($urlType === 'array') { + } elseif (is_array($url)) { if (isset($url['_full']) && $url['_full'] === true) { $full = true; unset($url['_full']); @@ -587,7 +571,17 @@ public static function url($url = null, $full = false) { $url = static::_applyUrlFilters($url); $output = static::$_collection->match($url, static::$_requestContext); } else { - // String urls. + $plainString = ( + strpos($url, 'javascript:') === 0 || + strpos($url, 'mailto:') === 0 || + strpos($url, 'tel:') === 0 || + strpos($url, 'sms:') === 0 || + strpos($url, '#') === 0 || + strpos($url, '?') === 0 || + strpos($url, '//') === 0 || + strpos($url, '://') !== false + ); + if ($plainString) { return $url; }