diff options
| author | Zach Copley <zach@status.net> | 2010-03-02 07:33:18 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-02 07:33:18 +0000 |
| commit | 6c1321b108206d05b75703da22ea8abab82071bf (patch) | |
| tree | 7380e7eb3f0ab121ea25413ddf6f847c8915fc2c /lib/action.php | |
| parent | dbb9957eea1887265532dbae000fb1fc30005988 (diff) | |
| parent | 40e1b249cf1535a6074c8b32e5820c8ad6427836 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
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 a7e0eb33b..0918c6858 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')); |