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

[quix0rs-gnu-social.git] / actions / facebooksettings.php

diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 817a11828ce2ee530a87653cee37b0def8482fb7..b2b1d68071a050ea7d34a02ed61227ad08220c50 100644 (file)
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.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,