diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-19 13:56:18 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-19 13:56:18 +0000 |
| commit | b76aa87f49135a416de91d73405c4f4e34f72bbb (patch) | |
| tree | 70458ebbb5494f217b3629779bdfd74f3f3e071a | |
| parent | 531c0738daab2d5f9b8324b85b45af7131aec0da (diff) | |
| parent | 4855cb58daf374404bec9489769cc57431e347f4 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into i18n-work
| -rw-r--r-- | actions/facebooksettings.php | 11 | ||||
| -rw-r--r-- | lib/facebookutil.php | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php index 84bdde910..b2b1d6807 100644 --- a/actions/facebooksettings.php +++ b/actions/facebooksettings.php @@ -58,8 +58,15 @@ class FacebooksettingsAction extends FacebookAction $this->flink->set_flags($noticesync, $replysync, false, false); $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, - substr($prefix, 0, 128)); + $trimmed); if ($result === false) { $this->showForm(_('There was a problem saving your sync preferences!')); @@ -101,7 +108,7 @@ class FacebooksettingsAction extends FacebookAction $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'), ($prefix) ? $prefix : null, diff --git a/lib/facebookutil.php b/lib/facebookutil.php index ad61b6f0a..c29576b64 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -99,8 +99,8 @@ function facebookBroadcastNotice($notice) // XXX: Does this call count against our per user FB request limit? // If so we should consider storing verb elsewhere or not storing - $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, - $fbuid); + $prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, + $fbuid)); $status = "$prefix $notice->content"; |