From 2400ddcb0585bd4bba5d4abeb1be8e2f4ebc56d6 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 2 Mar 2014 20:38:18 +0000
Subject: correct mis-spelled var name and correct empty password fields test

---
 lib/plugins/usermanager/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index aac2da605..eadfb76ad 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -632,7 +632,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             }
         }
         if ($this->_auth->canDo('modPass')) {
-            if ($newpass || $confirm) {
+            if ($newpass || $passconfirm) {
                 if ($this->_verifyPassword($newpass,$passconfirm)) {
                     $changes['pass'] = $newpass;
                 } else {
@@ -712,7 +712,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     protected function _verifyPassword($password, $confirm) {
         global $lang;
 
-        if (empty($password)) {
+        if (empty($password) && empty($confirm)) {
             return false;
         }
 
-- 
cgit v1.2.3