Added checked type-hints

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

diff --git a/plugins/TwitterBridge/actions/twittersettings.php b/plugins/TwitterBridge/actions/twittersettings.php
index 88799e75a9817964b1c3eb6fe1161edb445745a6..37abb4d27297281e501313ab17a147d0fe246d45 100644 (file)
--- a/plugins/TwitterBridge/actions/twittersettings.php
+++ b/plugins/TwitterBridge/actions/twittersettings.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+require_once dirname(__DIR__) . '/twitter.php';
 
 /**
  * Settings for Twitter integration
@@ -263,7 +263,6 @@ class TwittersettingsAction extends ProfileSettingsAction
         if (empty($flink)) {
             // TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
             $this->clientError(_m('No Twitter connection to remove.'));
-            return;
         }
 
         $result = $flink->safeDelete();
@@ -272,7 +271,6 @@ class TwittersettingsAction extends ProfileSettingsAction
             common_log_db_error($flink, 'DELETE', __FILE__);
             // TRANS: Server error displayed when trying to remove a connected Twitter account fails.
             $this->serverError(_m('Could not remove Twitter user.'));
-            return;
         }
 
         // TRANS: Success message displayed after disconnecting a Twitter account.