From 58f49cd2ee40342fee8fa8f0e69178e68576667c Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 31 Mar 2014 15:37:25 +0000
Subject: [PATCH] Add UserAccount Model
Conflicts:
include/class.user.php
---
include/class.user.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/class.user.php b/include/class.user.php
index ad54875fb..b6d75dfe6 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -663,7 +663,6 @@ class UserAccount extends UserAccountModel {
return true;
}
-
function __toString() {
return (string) $this->getStatus();
}
@@ -688,7 +687,7 @@ class UserAccount extends UserAccountModel {
// Changing password?
if ($vars['passwd1'] || $vars['passwd2']) {
if (!$vars['passwd1'])
- $errors['passwd1'] = 'Password required';
+ $errors['passwd1'] = 'New password required';
elseif ($vars['passwd1'] && strlen($vars['passwd1'])<6)
$errors['passwd1'] = 'Must be at least 6 characters';
elseif ($vars['passwd1'] && strcmp($vars['passwd1'], $vars['passwd2']))
--
GitLab