diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
| commit | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (patch) | |
| tree | 6100f1aa00f9930433f178173099c0ce67fdc502 /plugins/TwitterBridge | |
| parent | 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 (diff) | |
| parent | e121d472e7dbb914a85b10bde0a9e2add4d19d11 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
Diffstat (limited to 'plugins/TwitterBridge')
| -rw-r--r-- | plugins/TwitterBridge/TwitterBridgePlugin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 1a0a69682..65b3a6b38 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -221,7 +221,7 @@ class TwitterBridgePlugin extends Plugin */ function onStartEnqueueNotice($notice, &$transports) { - if (self::hasKeys()) { + if (self::hasKeys() && $notice->isLocal()) { // Avoid a possible loop if ($notice->source != 'twitter') { array_push($transports, 'twitter'); |