|
|
@@ -39,9 +39,8 @@ function url_origin($s, $use_forwarded_host=false) {
|
|
|
$port = $s['SERVER_PORT'];
|
|
|
$port = ((!$ssl && $port=='80') || ($ssl && $port=='443')) ? '' : ':'.$port;
|
|
|
$host = ($use_forwarded_host && isset($s['HTTP_X_FORWARDED_HOST'])) ? $s['HTTP_X_FORWARDED_HOST'] : (isset($s['HTTP_HOST']) ? $s['HTTP_HOST'] : $s['SERVER_NAME']);
|
|
|
- return $protocol . '://' . $host . $port;
|
|
|
+ return $protocol . '://' . $host;
|
|
|
}
|
|
|
-function full_url($s, $use_forwarded_host=false)
|
|
|
-{
|
|
|
+function full_url($s, $use_forwarded_host=false) {
|
|
|
return url_origin($s, $use_forwarded_host) . $s['REQUEST_URI'];
|
|
|
}
|
