diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-17 10:13:35 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-17 10:13:35 -0800 |
| commit | 3cb6b1670bd7e3860fdca217e4075f51378fe5e0 (patch) | |
| tree | 9d085d9bbc17f1070f574c5309692fa48308131d | |
| parent | 9f3246124dc9702ff3a7e422df4adff687e62f9c (diff) | |
| parent | e8275aa60abd381de9e95c29fd00819c81d3db79 (diff) | |
Merge branch 'master' into testing
| -rw-r--r-- | lib/htmloutputter.php | 2 | ||||
| -rw-r--r-- | plugins/Minify/MinifyPlugin.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 47e56fc8f..7315fe2ad 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -439,7 +439,7 @@ class HTMLOutputter extends XMLOutputter { if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) { $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($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); diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index b49b6a4ba..fe1883ded 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -96,7 +96,7 @@ class MinifyPlugin extends Plugin && is_null(common_config('theme', 'path')) && is_null(common_config('theme', 'server')); $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment'])) { if(!isset($theme)) { $theme = common_config('site', 'theme'); |