summaryrefslogtreecommitdiff
path: root/lib/Minz/Url.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-23 19:10:32 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-23 19:10:32 +0200
commitb042d3a7728037db90a9306c61091be0a8ac42c4 (patch)
tree717691d185a83b603252a8e8de6fb4e5858c65a8 /lib/Minz/Url.php
parent4862652585da1d69d62914659011c53146b21c17 (diff)
HTTP2 optimization
Fast flush HTTP headers, push promise CSS. Requires PHP 5.3+ due to anonymous function. Do not load syles, scripts, and notifications for Ajax requests. https://github.com/FreshRSS/FreshRSS/issues/1089
Diffstat (limited to 'lib/Minz/Url.php')
-rw-r--r--lib/Minz/Url.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 382437e9a..c7c67123e 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -24,11 +24,15 @@ class Minz_Url {
$url_string = '';
if ($absolute) {
- $url_string = Minz_Request::getBaseUrl(PUBLIC_TO_INDEX_PATH);
- if ($url_string === PUBLIC_TO_INDEX_PATH) {
+ $url_string = Minz_Request::getBaseUrl();
+ if ($url_string == '') {
$url_string = Minz_Request::guessBaseUrl();
- } else {
- $url_string .= '/';
+ }
+ if ($isArray) {
+ $url_string .= PUBLIC_TO_INDEX_PATH;
+ }
+ if ($absolute === 'root') {
+ $url_string = parse_url($url_string, PHP_URL_PATH);
}
} else {
$url_string = $isArray ? '.' : PUBLIC_RELATIVE;