From 187a70873a1af2eceafa12333e0c04750d01b5c2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 18 Jan 2010 11:29:05 +0000
Subject: Updated path to farbtastic stylesheet

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

(limited to 'lib')

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');
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf


From 3bf4056055fd5f278db8b8a46f4e524889483266 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Mon, 18 Jan 2010 09:28:58 -0800
Subject: Fix order of params on 'plugin not found' exception

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

(limited to 'lib')

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);
             }
         }
 
-- 
cgit v1.2.3-54-g00ecf