diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 00:40:34 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 00:40:34 +0200 |
| commit | b8b64ed77285e4d753d35d4ceab0516be597a2f1 (patch) | |
| tree | 7cc1a82a5887a9efeb3f9160f98613e65e404ba0 /inc/confutils.php | |
| parent | af07997c5ff7cc096965159d90158e3710d2d019 (diff) | |
| parent | 586da9c1028b1013e8dc47911ba430671a389b5b (diff) | |
| download | rpg-b8b64ed77285e4d753d35d4ceab0516be597a2f1.tar.gz rpg-b8b64ed77285e4d753d35d4ceab0516be597a2f1.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
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'; } |