From 2384f56ec08caf840f259ec35b51e10817c5859b Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Mon, 19 Aug 2013 02:25:53 +0200
Subject: [PATCH] personal settings autocomplete fix
---
include/admin/personal.inc.php | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/include/admin/personal.inc.php b/include/admin/personal.inc.php
index abab029a..7cba15dc 100644
--- a/include/admin/personal.inc.php
+++ b/include/admin/personal.inc.php
@@ -22,7 +22,21 @@ if ($serendipity['GET']['adminAction'] == 'save' && serendipity_checkFormToken()
$data['not_authorized'] = true;
} elseif (empty($_POST['username'])) {
$data['empty_username'] = true;
- } elseif (!empty($_POST['password']) && $_POST['check_password'] != $_SESSION['serendipityPassword'] && serendipity_passwordhash($_POST['check_password']) != $_SESSION['serendipityPassword']) {
+ } elseif ( (!empty($_POST['password'])
+ &&
+ !empty($_POST['check_password'])
+ &&
+ $_POST['check_password'] != $_SESSION['serendipityPassword']
+ &&
+ serendipity_passwordhash($_POST['check_password']) != $_SESSION['serendipityPassword'])
+ ||
+ (!empty($_POST['password'])
+ &&
+ empty($_POST['check_password'])
+ &&
+ $_POST['password'] != $_SESSION['serendipityPassword']
+ &&
+ serendipity_passwordhash($_POST['password']) != $_SESSION['serendipityPassword']) ) {
$data['password_check_fail'] = true;
} else {
$valid_groups = serendipity_getGroups($serendipity['authorid'], true);