diff options
Diffstat (limited to 'lib/htmloutputter.php')
| -rw-r--r-- | lib/htmloutputter.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index f4445b44f..604597116 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; } @@ -370,11 +370,8 @@ class HTMLOutputter extends XMLOutputter */ function cssLink($src,$theme=null,$media=null) { - if (!$theme) { - $theme = common_config('site', 'theme'); - } $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; |