Merge branch '0.9.x' into pluginize-twitter-bridge

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twittersettings.php

diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index b3d4a971f6d80ca88c6759d2fe6e836b1d7f45bd..2afa85ba4c0b3905ee24c349f37e5dc07e83dc9a 100644 (file)
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Settings for Twitter integration
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Settings
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,10 +38,10 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
  * Settings for Twitter integration
  *
  * @category Settings
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SettingsAction
  */
@@ -75,7 +75,7 @@ class TwittersettingsAction extends ConnectSettingsAction
      * Content area of the page
      *
      * Shows a form for associating a Twitter account with this
-     * Laconica account. Also lets the user set preferences.
+     * StatusNet account. Also lets the user set preferences.
      *
      * @return void
      */
@@ -160,7 +160,7 @@ class TwittersettingsAction extends ConnectSettingsAction
                                 ($flink->noticesync & FOREIGN_NOTICE_RECV) :
                                 false);
                 $this->elementEnd('li');
-
+            } else {
                 // preserve setting even if bidrection bridge toggled off
 
                 if ($flink && ($flink->noticesync & FOREIGN_NOTICE_RECV)) {