Fix issue #11582

In `url()` method, looks for `isset($url['_ssl'])` first, so that `_ssl` changes are only made if `$url['_full']` is not met. Then, looks for the string `:///` and replaces it with `://`. Has been tested with all combinations of `$url['_ssl']`, `$url['_full']`, and whether or not `App.fullBaseUrl` has been set.
cakephp · Dec 29, 2017 · 63aaf06 · 63aaf06
1 parent 8fc1a55
commit 63aaf06
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -617,6 +617,12 @@ public static function url($url = null, $full = false)
             return $output;
         }
         if (is_array($url)) {
+            if (isset($url['_ssl'])) {
+                if (!isset($url['_full'])) {
+                    $url['_scheme'] = ($url['_ssl'] === true) ? 'https' : 'http';
+                }
+                unset($url['_ssl']);
+            }
             if (isset($url['_full']) && $url['_full'] === true) {
                 $full = true;
                 unset($url['_full']);
@@ -625,10 +631,6 @@ public static function url($url = null, $full = false)
                 $frag = '#' . $url['#'];
                 unset($url['#']);
             }
-            if (isset($url['_ssl'])) {
-                $url['_scheme'] = ($url['_ssl'] === true) ? 'https' : 'http';
-                unset($url['_ssl']);
-            }
 
             $url = static::_applyUrlFilters($url);
 
@@ -679,6 +681,11 @@ public static function url($url = null, $full = false)
             }
         }
 
+        $protocolError = preg_match('#^[a-z][a-z0-9+\-.]*\:///#i', $output);
+        if ($protocolError === 1) {
+            $output = str_replace(':///', '://', $output);
+        }
+
         return $output . $frag;
     }