diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
commit | a535ccdc4eba320ad88dc531329ae63c7f09c258 (patch) | |
tree | a8448dfe0b764818562ca9d04a39f04d4978dead /actions/twittersettings.php | |
parent | f949c2c9d9afa63496f26b33d0309f8d06f77520 (diff) | |
parent | 0c95734a6874608ea5ed44608cabeda7c3a1b4ea (diff) |
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
lib/common.php
lib/twitter.php
Diffstat (limited to 'actions/twittersettings.php')
-rw-r--r-- | actions/twittersettings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 563d867a4..89169941e 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -165,7 +165,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)) { |