summaryrefslogtreecommitdiff
path: root/lib/plugins/authplain/auth.php
diff options
context:
space:
mode:
authorKlap-in <klapinklapin@gmail.com>2013-07-21 23:10:32 +0200
committerKlap-in <klapinklapin@gmail.com>2013-07-21 23:10:32 +0200
commitb1ffadaa6963bbf83e61917c31e04c04c421ce9e (patch)
treef9a1391d2ee6536473b1672e249c1b11a67a5b0e /lib/plugins/authplain/auth.php
parentfa3ed26bfbafa4d05ec77a799259d4a46baadd9a (diff)
parentfbd8067eeeb9f424981aad8b283e17f734c738c3 (diff)
downloadrpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.gz
rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.bz2
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/plugins/authplain/auth.php')
-rw-r--r--lib/plugins/authplain/auth.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index 3416ede89..8c4ce0dd9 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -198,13 +198,9 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
if(empty($deleted)) return 0;
$pattern = '/^('.join('|', $deleted).'):/';
+ io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true);
- if(io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true)) {
- foreach($deleted as $user) unset($this->users[$user]);
- return count($deleted);
- }
-
- // problem deleting, reload the user list and count the difference
+ // reload the user list and count the difference
$count = count($this->users);
$this->_loadUserData();
$count -= count($this->users);