diff options
Diffstat (limited to 'engine/lib/actions.php')
| -rw-r--r-- | engine/lib/actions.php | 12 | 
1 files changed, 8 insertions, 4 deletions
| diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 278194ac3..25ef411f6 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -24,13 +24,17 @@ function action($action, $forwarder = "") {  	// set GET params  	elgg_set_input_from_uri(); -	// @todo REMOVE THESE EXCEPTIONS IN 1.8. -	// These are only to provide a way to disable plugins that overwrite core -	// UI without tokens.  (And for installation because of session_id problems) +	// @todo REMOVE THESE ONCE #1509 IS IN PLACE. +	// Allow users to disable plugins without a token in order to +	// remove plugins that are imcompatible. +	// Installation cannot use tokens because it requires site secret to be +	// working. (#1462) +	// Login and logout are for convenience.  	$exceptions = array(  		'systemsettings/install',  		'admin/plugins/disable', -		'logout' +		'logout', +		'login'  	);  	if (!in_array($action, $exceptions)) { | 
