Merge branch 'testing'

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index ad3c2e551..de1181903 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -86,8 +86,8 @@ class TwitterBridgePlugin extends Plugin
         $action_name = $action->trimmed('action');
 
         $action->menuItem(common_local_url('twittersettings'),
-                          _('Twitter'),
-                          _('Twitter integration options'),
+                          _m('Twitter'),
+                          _m('Twitter integration options'),
                           $action_name === 'twittersettings');
 
         return true;
@@ -127,7 +127,12 @@ class TwitterBridgePlugin extends Plugin
      */
     function onStartEnqueueNotice($notice, &$transports)
     {
-        array_push($transports, 'twitter');
+        // Avoid a possible loop
+
+        if ($notice->source != 'twitter') {
+            array_push($transports, 'twitter');
+        }
+
         return true;
     }