From 060d5c4b8e1eea9561fe9dcad972cb412a5b00ec Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 8 Aug 2009 22:56:42 -0400 Subject: [PATCH] Fix logic that determines if a URL is relative or absolute in script() and cssLink() --- lib/htmloutputter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 2684baca60..6045971161 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -350,7 +350,7 @@ class HTMLOutputter extends XMLOutputter function script($src, $type='text/javascript') { $url = parse_url($src); - if(! ($url->scheme || $url->host || $url->query || $url->fragment)) + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) { $src = common_path($src) . '?version=' . LACONICA_VERSION; } @@ -371,7 +371,7 @@ class HTMLOutputter extends XMLOutputter function cssLink($src,$theme=null,$media=null) { $url = parse_url($src); - if(! ($url->scheme || $url->host || $url->query || $url->fragment)) + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) { if(file_exists(theme_file($src,$theme))){ $src = theme_path($src, $theme) . '?version=' . LACONICA_VERSION;