wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-11-25 20:37:44 +00:00
commit 9d5e8649fa
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Avatar.php
View File

@ -81,7 +81,7 @@ class Avatar extends Memcached_DataObject
if (empty($server)) { if (empty($server)) {
$server = common_config('site', 'server'); $server = common_config('site', 'server');
} }
common_debug('path = ' . $path);
// XXX: protocol // XXX: protocol
return 'http://'.$server.$path.$filename; return 'http://'.$server.$path.$filename;

7
lib/util.php
View File

@ -58,18 +58,17 @@ function common_init_language()
// (say, ga_ES for Galego/Galician) it seems to take it. // (say, ga_ES for Galego/Galician) it seems to take it.
common_init_locale("en_US"); 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(); $language = common_language();
$locale_set = common_init_locale($language); $locale_set = common_init_locale($language);
setlocale(LC_CTYPE, 'C'); setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales // So we do not have to make people install the gettext locales
$path = common_config('site','locale_path'); $path = common_config('site','locale_path');
bindtextdomain("statusnet", $path); bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8"); bind_textdomain_codeset("statusnet", "UTF-8");
textdomain("statusnet"); 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() function common_timezone()

2
plugins/TwitterBridge/twitter.php
View File

@ -178,7 +178,7 @@ function broadcast_oauth($notice, $flink) {
try { try {
$status = $client->statusesUpdate($statustxt); $status = $client->statusesUpdate($statustxt);
} catch (OAuthClientCurlException $e) { } catch (OAuthClientException $e) {
return process_error($e, $flink); return process_error($e, $flink);
} }