Merge branch '0.9.x' into 1.0.x
Conflicts: lib/command.php
This commit is contained in:
@@ -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))) {
|
||||
|
Reference in New Issue
Block a user