Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/designsettings.php b/lib/designsettings.php
index b70ba0dfc..8e44c03a9 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction
     function showStylesheets()
     {
         parent::showStylesheets();
-        $this->cssLink('css/farbtastic.css','base','screen, projection, tv');
+        $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
     }
 
     /**
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 29e903026..beeb26ccc 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);
             }
         }