diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-11-19 21:26:50 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-11-19 21:26:50 +0100 |
| commit | 703aeaef1a43b07dc5497dba72c98151466396cc (patch) | |
| tree | 1e18a6b3fc3c28156c2e56f8a3d515b8dd6a9cf9 /inc/confutils.php | |
| parent | 33c3b3817b00aa9384760813643fac0e33daaaff (diff) | |
| parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
| download | rpg-703aeaef1a43b07dc5497dba72c98151466396cc.tar.gz rpg-703aeaef1a43b07dc5497dba72c98151466396cc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
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'; } |