diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
| commit | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (patch) | |
| tree | c813b1fe3590314fcb1f20a30811d5de92871583 /inc/confutils.php | |
| parent | d637819dca760b20f6e53e5847a92d08d8d15b8c (diff) | |
| parent | 90d5fa676926189b265430239dca3b7ba668b30b (diff) | |
| download | rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.gz rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'inc/confutils.php')
| -rw-r--r-- | inc/confutils.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index 404cc6050..0ac003b72 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -241,7 +241,7 @@ function getConfigFiles($type) { */ function actionOK($action){ static $disabled = null; - if(is_null($disabled)){ + if(is_null($disabled) || defined('SIMPLE_TEST')){ global $conf; /** @var auth_basic $auth */ global $auth; @@ -261,6 +261,9 @@ function actionOK($action){ if (is_null($auth) || !$auth->canDo('Profile')) { $disabled[] = 'profile'; } + if (is_null($auth) || !$auth->canDo('delUser')) { + $disabled[] = 'profile_delete'; + } if (is_null($auth)) { $disabled[] = 'login'; } |