From 5fd8e331f3db997df202b031d46539b748861db5 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Sat, 16 Jan 2010 11:56:07 -0500
Subject: Missed change when refactoring groups. Thanks macno

---
 actions/apigroupjoin.php  | 2 +-
 actions/apigroupleave.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 3309d63e7..374cf83df 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -145,7 +145,7 @@ class ApiGroupJoinAction extends ApiAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($this->group);
             break;
         case 'json':
             $this->showSingleJsonGroup($this->group);
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 6f8d40527..9848ece05 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -131,7 +131,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($this->group);
             break;
         case 'json':
             $this->showSingleJsonGroup($this->group);
-- 
cgit v1.2.3-54-g00ecf


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

---
 actions/designadminpanel.php | 2 +-
 lib/designsettings.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index f862aff0e..72ad6ade2 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction
     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/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 d501acf4388e936d1b793e2516393d78809b700d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 18 Jan 2010 17:17:02 +0000
Subject: Missing null className for incoming email form legend

---
 actions/emailsettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index bfef2970d..08608348c 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
        if (common_config('emailpost', 'enabled') && $user->email) {
             $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
-            $this->element('legend',_('Incoming email'));
+            $this->element('legend', null, _('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
-- 
cgit v1.2.3-54-g00ecf