diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-02 02:56:57 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-02 02:56:57 -0500 |
| commit | f504a9237e64c49286b355de87ea59abe14b1090 (patch) | |
| tree | a0ce30d9099954ac912e450f1f8f01c6b9fb25d3 /lib/action.php | |
| parent | 2c677e0f2d881f0c9f5713fcbc37ad24ef0dab26 (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')); |