Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
b0ddbe75a3
@ -58,8 +58,15 @@ class FacebooksettingsAction extends FacebookAction
|
|||||||
$this->flink->set_flags($noticesync, $replysync, false, false);
|
$this->flink->set_flags($noticesync, $replysync, false, false);
|
||||||
$result = $this->flink->update($original);
|
$result = $this->flink->update($original);
|
||||||
|
|
||||||
|
if ($prefix == '' || $prefix == '0') {
|
||||||
|
// Facebook bug: saving empty strings to prefs now fails
|
||||||
|
// http://bugs.developers.facebook.com/show_bug.cgi?id=7110
|
||||||
|
$trimmed = $prefix . ' ';
|
||||||
|
} else {
|
||||||
|
$trimmed = substr($prefix, 0, 128);
|
||||||
|
}
|
||||||
$this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
|
$this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
|
||||||
substr($prefix, 0, 128));
|
$trimmed);
|
||||||
|
|
||||||
if ($result === false) {
|
if ($result === false) {
|
||||||
$this->showForm(_('There was a problem saving your sync preferences!'));
|
$this->showForm(_('There was a problem saving your sync preferences!'));
|
||||||
@ -101,7 +108,7 @@ class FacebooksettingsAction extends FacebookAction
|
|||||||
|
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
|
|
||||||
$prefix = $this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX);
|
$prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX));
|
||||||
|
|
||||||
$this->input('prefix', _('Prefix'),
|
$this->input('prefix', _('Prefix'),
|
||||||
($prefix) ? $prefix : null,
|
($prefix) ? $prefix : null,
|
||||||
|
@ -99,8 +99,8 @@ function facebookBroadcastNotice($notice)
|
|||||||
// XXX: Does this call count against our per user FB request limit?
|
// XXX: Does this call count against our per user FB request limit?
|
||||||
// If so we should consider storing verb elsewhere or not storing
|
// If so we should consider storing verb elsewhere or not storing
|
||||||
|
|
||||||
$prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
|
$prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
|
||||||
$fbuid);
|
$fbuid));
|
||||||
|
|
||||||
$status = "$prefix $notice->content";
|
$status = "$prefix $notice->content";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user