multiple strpos to preg_match

cakephp · Aug 1, 2012 · 57bf15a · 57bf15a
1 parent 319658e
commit 57bf15a
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -829,14 +829,7 @@ public static function url($url = null, $full = false) {
 				$output = self::_handleNoRoute($url);
 			}
 		} else {
-			if (
+			if (preg_match('/:\/\/|^(javascript|mailto|tel|sms):|\#/i', $url)) {
-				(strpos($url, '://') !== false ||
-				(strpos($url, 'javascript:') === 0) ||
-				(strpos($url, 'mailto:') === 0) ||
-				(strpos($url, 'tel:') === 0) ||
-				(strpos($url, 'sms:') === 0)) ||
-				(!strncmp($url, '#', 1))
-			) {
 				return $url;
 			}
 			if (substr($url, 0, 1) === '/') {