summaryrefslogtreecommitdiff
path: root/inc/confutils.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-08-02 21:52:50 +0200
committerAndreas Gohr <andi@splitbrain.org>2013-08-02 21:52:50 +0200
commit395e7d8e1e303ae87be5d88abc67947b89e1a5a4 (patch)
tree4e91abd30543ca241c8528ab75d6a2264c43d151 /inc/confutils.php
parent5b230a45afb9bb825ba148e699bdcbfc57957fb4 (diff)
parent836a17626793ab95d666c62e9c21b3df2568eeb4 (diff)
downloadrpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.gz
rpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.bz2
Merge branch 'pull-request-245'
* pull-request-245: coding corrections. correct type hint, remove unused variable assignment HTTPClient don't pull too much bytes when no content-length is given de/de-informal: localization updates (delete user function) unit tests for self deleting of user accounts FS#2751 - self deletion of user account Conflicts: inc/lang/de-informal/lang.php inc/lang/de/lang.php
Diffstat (limited to 'inc/confutils.php')
-rw-r--r--inc/confutils.php5
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';
}