summaryrefslogtreecommitdiff
path: root/lib/plugins
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2014-03-02 20:38:18 +0000
committerChristopher Smith <chris@jalakai.co.uk>2014-03-02 20:38:18 +0000
commit2400ddcb0585bd4bba5d4abeb1be8e2f4ebc56d6 (patch)
tree2b7d7a5c4d2cd6dcf0d39adc61512918a3216fe3 /lib/plugins
parent6c196437d1096ad1c443124ca28927e4d36319e5 (diff)
downloadrpg-2400ddcb0585bd4bba5d4abeb1be8e2f4ebc56d6.tar.gz
rpg-2400ddcb0585bd4bba5d4abeb1be8e2f4ebc56d6.tar.bz2
correct mis-spelled var name and correct empty password fields test
Diffstat (limited to 'lib/plugins')
-rw-r--r--lib/plugins/usermanager/admin.php4
1 files changed, 2 insertions, 2 deletions
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;
}