From 2a7abf2d7fee6a2d6418e5ad4b79e37e6049bd92 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 31 Jul 2013 18:14:26 +0200
Subject: FS#2751 - self deletion of user account

---
 inc/confutils.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'inc/confutils.php')

diff --git a/inc/confutils.php b/inc/confutils.php
index 404cc6050..02be0089c 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -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';
         }
-- 
cgit v1.2.3


From 020ea9e10577217f17372cb6510d872f9a5c647c Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 31 Jul 2013 18:15:57 +0200
Subject: unit tests for self deleting of user accounts

---
 inc/confutils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/confutils.php')

diff --git a/inc/confutils.php b/inc/confutils.php
index 02be0089c..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;
-- 
cgit v1.2.3