|
@@ -335,10 +335,10 @@ discard block |
|
|
block discarded – undo |
|
335
|
335
|
{ |
|
336
|
336
|
if (trim($_SERVER['REQUEST_URI']) === '/') { |
|
337
|
337
|
$url = $this->baseURL() |
|
338
|
|
- . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
|
338
|
+ . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
339
|
339
|
} else { |
|
340
|
340
|
$url = $this->baseURL($this->uri) |
|
341
|
|
- . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
|
341
|
+ . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
342
|
342
|
} |
|
343
|
343
|
|
|
344
|
344
|
if (!empty($params)) { |
|
@@ -362,7 +362,7 @@ discard block |
|
|
block discarded – undo |
|
362
|
362
|
if (is_null($this->baseURL)) { |
|
363
|
363
|
$self = $_SERVER['PHP_SELF']; |
|
364
|
364
|
$server = $_SERVER['HTTP_HOST'] |
|
365
|
|
- . rtrim(str_replace(strstr($self, 'index.php'), '', $self), '/'); |
|
|
365
|
+ . rtrim(str_replace(strstr($self, 'index.php'), '', $self), '/'); |
|
366
|
366
|
|
|
367
|
367
|
if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') |
|
368
|
368
|
|| !empty($_SERVER['HTTP_X_FORWARDED_PROTO']) |
Please login to merge, or discard this patch.