summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-02-17 12:02:59 -0500
committerBrion Vibber <brion@pobox.com>2010-02-17 10:10:07 -0800
commit8e07926a9c0736b5a3f408465dded92676ac1862 (patch)
treeed0aca9e92555165d569a3a0cda2b3ef8ff20f75
parentc74aea589d5a79d7048470d44e457dffc8919ad3 (diff)
parse_url returns an associative array - not an object
-rw-r--r--lib/htmloutputter.php2
-rw-r--r--plugins/Minify/MinifyPlugin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 317f5ea61..4a88337bc 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -428,7 +428,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');