|
@@ -29,7 +29,7 @@ discard block |
|
|
block discarded – undo |
|
29
|
29
|
|
|
30
|
30
|
if (strpos($requestUri, '?')) list($requestUri, $queryString) = explode('?', $requestUri); |
|
31
|
31
|
|
|
32
|
|
- if (! in_array($script, ['/', '\\'])) { |
|
|
32
|
+ if (!in_array($script, ['/', '\\'])) { |
|
33
|
33
|
|
|
34
|
34
|
$this->url = preg_replace('#^' . $script . '#', '', $requestUri); |
|
35
|
35
|
} else { |
|
@@ -46,7 +46,7 @@ discard block |
|
|
block discarded – undo |
|
46
|
46
|
$isSecure = true; |
|
47
|
47
|
|
|
48
|
48
|
} |
|
49
|
|
- elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL'])) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
|
49
|
+ elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL'])) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
50
|
50
|
$isSecure = true; |
|
51
|
51
|
} |
|
52
|
52
|
|
Please login to merge, or discard this patch.