diff options
| -rw-r--r-- | classes/Avatar.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 7 | ||||
| -rw-r--r-- | plugins/TwitterBridge/twitter.php | 2 |
3 files changed, 5 insertions, 6 deletions
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; 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() 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); } |