diff options
| author | Brion Vibber <brion@pobox.com> | 2010-09-02 15:04:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-09-02 15:04:25 -0700 |
| commit | 2196d00b1b9a97b498897099c6993383c43b1d44 (patch) | |
| tree | 2c0cb5a0d12b93eb743ff93c52c7d3209c619003 /lib/util.php | |
| parent | 6df8230488f3c4035ac2c3385631978b5a746fbc (diff) | |
| parent | e365e709c5bab7d593ee1cde26c8bcfdddcc6780 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/command.php
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php index f187926b5..b7d3c80ca 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1045,8 +1045,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad function common_is_sensitive($action) { - static $sensitive = array('login', 'register', 'passwordsettings', - 'twittersettings', 'api'); + static $sensitive = array('login', 'register', 'passwordsettings', 'api'); $ssl = null; if (Event::handle('SensitiveAction', array($action, &$ssl))) { |