From 8e07926a9c0736b5a3f408465dded92676ac1862 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 17 Feb 2010 12:02:59 -0500
Subject: [PATCH 1/2] parse_url returns an associative array - not an object

---
 lib/htmloutputter.php           | 2 +-
 plugins/Minify/MinifyPlugin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 317f5ea612..4a88337bc5 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 b49b6a4bad..fe1883ded4 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');

From e8275aa60abd381de9e95c29fd00819c81d3db79 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 17 Feb 2010 10:12:37 -0800
Subject: [PATCH 2/2] Fix exception on bad plugin load

---
 lib/statusnet.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 9c7ede5a5d..257bd861da 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -63,7 +63,7 @@ class StatusNet
                 }
             }
             if (!class_exists($pluginclass)) {
-                throw new ServerException(500, "Plugin $name not found.");
+                throw new ServerException("Plugin $name not found.", 500);
             }
         }