Permalink
Browse files

replaced error-proned wierd HTTPS server var call in Pico->base_url

  • Loading branch information...
1 parent 4314b47 commit ce55a6543bd1d43e6b87254d6739e1d879c59186 Bill Ortell committed Apr 18, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 lib/pico.php
View
@@ -103,10 +103,16 @@ function base_url()
$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]);
+ }
+
}
?>

0 comments on commit ce55a65

Please sign in to comment.