Fix logic that determines if a URL is relative or absolute in script() and cssLink()

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 2684baca60abbda4a664971a9279e008b3ac3e2d..6045971161d5e933437d5c1be6d02e61e870f802 100644 (file)
--- 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;