diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:49:24 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:49:24 +0200 |
| commit | 836a17626793ab95d666c62e9c21b3df2568eeb4 (patch) | |
| tree | 7dd5a3d938ebe2774637482f420b95070d59e725 /inc/confutils.php | |
| parent | 20284fef7eb61e54db0fd854a9172295aa4f8baa (diff) | |
| parent | 0f3dc5ebb0dc3386758834bd6646b46a514dfeff (diff) | |
| download | rpg-836a17626793ab95d666c62e9c21b3df2568eeb4.tar.gz rpg-836a17626793ab95d666c62e9c21b3df2568eeb4.tar.bz2 | |
Merge branch 'FS#2751' of git://github.com/splitbrain/dokuwiki into pull-request-245
* 'FS#2751' of git://github.com/splitbrain/dokuwiki:
coding corrections. correct type hint, remove unused variable assignment
de/de-informal: localization updates (delete user function)
unit tests for self deleting of user accounts
FS#2751 - self deletion of user account
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'; } |