Merge pull request #1 from billortell/master
replaced unusual SERVER var "HTTPS" call as it was causing NOTICE
This commit is contained in:
commit
13d9a0514b
1 changed files with 7 additions and 1 deletions
|
@ -103,10 +103,16 @@ class Pico {
|
|||
$script_url = (isset($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : '';
|
||||
if($request_url != $script_url) $url = trim(preg_replace('/'. str_replace('/', '\/', str_replace('index.php', '', $script_url)) .'/', '', $request_url, 1), '/');
|
||||
|
||||
$protocol = $_SERVER['HTTPS'] ? "https" : "http";
|
||||
$protocol = $this->get_protocol();
|
||||
return rtrim(str_replace($url, '', $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']), '/');
|
||||
}
|
||||
|
||||
function get_protocol()
|
||||
{
|
||||
preg_match("|^HTTP[S]?|is",$_SERVER['SERVER_PROTOCOL'],$m);
|
||||
return strtolower($m[0]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
Loading…
Reference in a new issue