diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
| commit | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (patch) | |
| tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /lib/action.php | |
| parent | 8629664ed90ffb496f607d15491821217f6b3126 (diff) | |
| parent | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php index b26ec8f01..a804b8e82 100644 --- a/lib/action.php +++ b/lib/action.php @@ -425,8 +425,6 @@ class Action extends HTMLOutputter // lawsuit $connect = 'imsettings'; } else if (common_config('sms', 'enabled')) { $connect = 'smssettings'; - } else if (common_config('twitter', 'enabled')) { - $connect = 'twittersettings'; } $this->elementStart('dl', array('id' => 'site_nav_global_primary')); |