From 79a1365991557d64776110b0a3a99ea42b1a70fe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 30 Jan 2010 20:43:53 -0800
Subject: Don't override the password in the database if it's empty in the
 form. Fixes ticket #995.

---
 modules/user/controllers/admin_users.php | 4 +++-
 modules/user/controllers/users.php       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 1b0e48a4..c11b0596 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -112,7 +112,9 @@ class Admin_Users_Controller extends Admin_Controller {
       $valid = $form->validate();
       $user->name = $form->edit_user->inputs["name"]->value;
       $user->full_name = $form->edit_user->full_name->value;
-      $user->password = $form->edit_user->password->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
       $user->email = $form->edit_user->email->value;
       $user->url = $form->edit_user->url->value;
       $user->locale = $form->edit_user->locale->value;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index ede1f0de..d0c67dd1 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -29,7 +29,9 @@ class Users_Controller extends Controller {
     try {
       $valid = $form->validate();
       $user->full_name = $form->edit_user->full_name->value;
-      $user->password = $form->edit_user->password->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
       $user->email = $form->edit_user->email->value;
       $user->url = $form->edit_user->url->value;
 
-- 
cgit v1.2.3