From 7e5bf39f768e3c97ddb5b82ad20a690b674f1f47 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 12:57:40 -0800
Subject: Avoid notice on local group creation when uri isn't passed in at
 create time (needs to be generated)

---
 classes/User_group.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/classes/User_group.php b/classes/User_group.php
index 1a5ddf253..0460c9870 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -455,6 +455,11 @@ class User_group extends Memcached_DataObject
         $group = new User_group();
 
         $group->query('BEGIN');
+        
+        if (empty($uri)) {
+            // fill in later...
+            $uri = null;
+        }
 
         $group->nickname    = $nickname;
         $group->fullname    = $fullname;
-- 
cgit v1.2.3-54-g00ecf


From c04c8ae59a7953a21cc464a49b657dfdc926e009 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 13:00:09 -0800
Subject: quick fix: skip notice from unused variable on group atom feed
 generation

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

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index d0af49844..e30a08fb5 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
                 // @todo set all this Atom junk up inside the feed class
 
-                $atom->setId($id);
+                #$atom->setId($id);
                 $atom->setTitle($title);
                 $atom->setSubtitle($subtitle);
                 $atom->setLogo($logo);
-- 
cgit v1.2.3-54-g00ecf


From 339b0b0a4d506638b7b3457db295ab7969e2a9df Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 3 Mar 2010 13:05:11 -0800
Subject: Don't expose global Twitter consumer key and secret, because that
 would be idiotic.

---
 plugins/TwitterBridge/twitteradminpanel.php | 40 +++--------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php
index 0ed53bc05..a78a92c66 100644
--- a/plugins/TwitterBridge/twitteradminpanel.php
+++ b/plugins/TwitterBridge/twitteradminpanel.php
@@ -225,46 +225,12 @@ class TwitterAdminPanelForm extends AdminForm
         );
         $this->unli();
 
-                $globalConsumerKey = common_config('twitter', 'global_consumer_key');
+        $globalConsumerKey = common_config('twitter', 'global_consumer_key');
         $globalConsumerSec = common_config('twitter', 'global_consumer_secret');
 
-        if (!empty($globalConsumerKey)) {
+        if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) {
             $this->li();
-            $this->out->element(
-                'label',
-                array('for' => 'global_consumer_key'),
-                ''
-            );
-            $this->out->element(
-                'input',
-                array(
-                    'name'     => 'global_consumer_key',
-                    'type'     => 'text',
-                    'id'       => 'global_consumer_key',
-                    'value'    => $globalConsumerKey,
-                    'disabled' => 'true'
-                )
-            );
-            $this->out->element('p', 'form_guide', _('Global consumer key'));
-            $this->unli();
-
-            $this->li();
-            $this->out->element(
-                'label',
-                array('for' => 'global_consumer_secret'),
-                ''
-            );
-            $this->out->element(
-                'input',
-                array(
-                    'name'     => 'global_consumer_secret',
-                    'type'     => 'text',
-                    'id'       => 'global_consumer_secret',
-                    'value'    => $globalConsumerSec,
-                    'disabled' => 'true'
-                   )
-            );
-            $this->out->element('p', 'form_guide', _('Global consumer secret'));
+            $this->out->element('p', 'form_guide', _('Note: a global consumer key and secret are set.'));
             $this->unli();
         }
 
-- 
cgit v1.2.3-54-g00ecf