summaryrefslogtreecommitdiff
path: root/actions/twittersettings.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-05-10 23:12:52 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-05-10 23:12:52 +0000
commitd6ec21fbc6d6f2d75c010075998d163809e89546 (patch)
tree61208b68acbe11932e6ef2efcd9ccd15b25743ba /actions/twittersettings.php
parentc7d6e5b0157e1bab08351a326d09259476c06b70 (diff)
parentfbf23ae0ee4c8c63e80e3511aa7fce980b8d1ed5 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'actions/twittersettings.php')
-rw-r--r--actions/twittersettings.php23
1 files changed, 16 insertions, 7 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 580d9ecf7..1bce57695 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -158,13 +158,22 @@ class TwittersettingsAction extends ConnectSettingsAction
($flink->friendsync & FOREIGN_FRIEND_RECV) :
false);
$this->elementEnd('li');
- $this->elementStart('li');
- $this->checkbox('noticerecv',
- _('Import my Friends Timeline.'),
- ($flink) ?
- ($flink->noticesync & FOREIGN_NOTICE_RECV) :
- false);
- $this->elementEnd('li');
+
+ if (common_config('twitterbridge','enabled')) {
+ $this->elementStart('li');
+ $this->checkbox('noticerecv',
+ _('Import my Friends Timeline.'),
+ ($flink) ?
+ ($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)) {
+ $this->hidden('noticerecv', true, 'noticerecv');
+ }
+ }
+
$this->elementEnd('ul');
if ($flink) {