Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/command.php
This commit is contained in:
Brion Vibber
2010-09-02 15:04:25 -07:00
60 changed files with 11029 additions and 45545 deletions

View File

@@ -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))) {