Doing some refactoring, to reduce code duplication.

cakephp · Oct 30, 2010 · dbce29a · dbce29a
1 parent 3ca0cdb
commit dbce29a
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -820,16 +820,15 @@ public static function url($url = null, $full = false) {
 			}
 		}
 		$protocol = strpos($output, '://');
-		if ($protocol > 3 && $protocol < 6) {
-			return $output . $extension . self::queryString($q, array(), $escape) . $frag;
-		}
-		$output = str_replace('//', '/', $base . '/' . $output);
+		if ($protocol === false || $protocol > 6) {
+			$output = str_replace('//', '/', $base . '/' . $output);
 
-		if ($full && defined('FULL_BASE_URL')) {
-			$output = FULL_BASE_URL . $output;
-		}
-		if (!empty($extension)) {
-			$output = rtrim($output, '/');
+			if ($full && defined('FULL_BASE_URL')) {
+				$output = FULL_BASE_URL . $output;
+			}
+			if (!empty($extension)) {
+				$output = rtrim($output, '/');
+			}
 		}
 		return $output . $extension . self::queryString($q, array(), $escape) . $frag;
 	}