From f7c1c4e6015ace99caace90e09bec24384e43d88 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 25 Nov 2009 18:04:08 +0000
Subject: Catch uncaught exception

---
 plugins/TwitterBridge/twitter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 3c6803e49..fd5150638 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -178,7 +178,7 @@ function broadcast_oauth($notice, $flink) {
 
     try {
         $status = $client->statusesUpdate($statustxt);
-    } catch (OAuthClientCurlException $e) {
+    } catch (OAuthClientException $e) {
         return process_error($e, $flink);
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 4ef515973aae9640ad96d187ab7dcbcbb6081169 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 25 Nov 2009 11:20:41 -0800
Subject: Drop error message on setlocale() failure; this is harmless, since we
 actually have a working locale set up.

---
 lib/util.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 5bf4f6091..6946f60fe 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -58,18 +58,17 @@ function common_init_language()
     // (say, ga_ES for Galego/Galician) it seems to take it.
     common_init_locale("en_US");
 
+    // Note that this setlocale() call may "fail" but this is harmless;
+    // gettext will still select the right language.
     $language = common_language();
     $locale_set = common_init_locale($language);
+    
     setlocale(LC_CTYPE, 'C');
     // So we do not have to make people install the gettext locales
     $path = common_config('site','locale_path');
     bindtextdomain("statusnet", $path);
     bind_textdomain_codeset("statusnet", "UTF-8");
     textdomain("statusnet");
-
-    if(!$locale_set) {
-        common_log(LOG_INFO, 'Language requested:' . $language . ' - locale could not be set. Perhaps that system locale is not installed.', __FILE__);
-    }
 }
 
 function common_timezone()
-- 
cgit v1.2.3-54-g00ecf


From 40e875f9cc5ec0c17605adcef73205a49f422abd Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 25 Nov 2009 19:22:09 +0000
Subject: Remove annoying log msg

---
 classes/Avatar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Avatar.php b/classes/Avatar.php
index cc7a6b647..8d6424e8b 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -81,7 +81,7 @@ class Avatar extends Memcached_DataObject
         if (empty($server)) {
             $server = common_config('site', 'server');
         }
-        common_debug('path = ' . $path);
+
         // XXX: protocol
 
         return 'http://'.$server.$path.$filename;
-- 
cgit v1.2.3-54-g00ecf