From 31314e9ac9d30b6a3a42dc3ac058eafdce768f3e Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 13 Dec 2013 21:59:57 +0000
Subject: [PATCH] Don't force password change when password is not provided.

This might happen when the user is being authenticated externally e.g LDAP.
---
 include/class.staff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/class.staff.php b/include/class.staff.php
index f2e3d6b38..3883ab363 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -812,10 +812,10 @@ class Staff extends AuthenticatedUser {
 
         if($vars['passwd1']) {
             $sql.=' ,passwd='.db_input(Passwd::hash($vars['passwd1']));
-        }
 
-        if(isset($vars['change_passwd']))
-            $sql.=' ,change_passwd=1';
+            if(isset($vars['change_passwd']))
+                $sql.=' ,change_passwd=1';
+        }
 
         if($id) {
             $sql='UPDATE '.STAFF_TABLE.' '.$sql.' WHERE staff_id='.db_input($id);
-- 
GitLab