Merge pull request #3183 from StefanKelm/2.4

Update Log.php

app/Model/Log.php

@@ -16,45 +16,45 @@ class Log extends AppModel {
 	public $validate = array(
 			'action' => array(
 			'rule' => array('inList', array(
+							'accept',
+							'accept_delegation',
+							'add',
+							'admin_email',
+							'auth',
+							'auth_fail',
+							'blacklisted',
+							'change_pw',
+							'delete',
+							'disable',
+							'discard',
+							'edit',
+							'email',
+							'enable',
+							'error',
+							'export',
+							'file_upload',
+							'galaxy',
 							'login',
 							'login_fail',
 							'logout',
-							'add',
+							'merge',
-							'edit',
+							'pruneUpdateLogs',
-							'change_pw',
-							'delete',
 							'publish',
-							'accept',
+							'publish alert',
-							'discard',
 							'pull',
 							'push',
-							'blacklisted',
-							'admin_email',
-							'tag',
-							'publish alert',
-							'warning',
-							'error',
-							'email',
-							'serverSettingsEdit',
 							'remove_dead_workers',
-							'upload_sample',
+							'request_delegation',
+							'reset_auth_key',
+							'serverSettingsEdit',
+							'tag',
+							'undelete',
+							'update',
 							'update_database',
 							'upgrade_24',
+							'upload_sample',
 							'version_warning',
-							'auth',
+							'warning'
-							'auth_fail',
-							'reset_auth_key',
-							'update',
-							'enable',
-							'disable',
-							'accept_delegation',
-							'request_delegation',
-							'merge',
-							'undelete',
-							'file_upload',
-							'export',
-							'pruneUpdateLogs',
-							'galaxy'
 						)),
 			'message' => 'Options : ...'
 		)