diff options
| author | ctrlaltca <ctrlaltca@gmail.com> | 2014-08-26 16:59:21 +0200 |
|---|---|---|
| committer | ctrlaltca <ctrlaltca@gmail.com> | 2014-08-26 16:59:21 +0200 |
| commit | 74b31be9515eddfa63005d6760614badfaba9fea (patch) | |
| tree | 47c952901dcb5eccd6dd8b7c6ee7e0b6bf176510 /framework/Security/TUserManager.php | |
| parent | 2b11341614ac4a15be697fa8acad07055154ac54 (diff) | |
| parent | 0c5026b55cde5c104f10686afd8b441568175d38 (diff) | |
Backports for Prado 3.2.4
Diffstat (limited to 'framework/Security/TUserManager.php')
| -rw-r--r-- | framework/Security/TUserManager.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php index 5cb716dd..4ad67a15 100644 --- a/framework/Security/TUserManager.php +++ b/framework/Security/TUserManager.php @@ -4,9 +4,8 @@ * * @author Qiang Xue <qiang.xue@gmail.com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Security */ @@ -64,7 +63,6 @@ Prado::using('System.Security.TUser'); * * @author Qiang Xue <qiang.xue@gmail.com> * @author Carl Mathisen <carl@kamikazemedia.no> - * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Security * @since 3.0 */ @@ -108,7 +106,7 @@ class TUserManager extends TModule implements IUserManager */ public function init($config) { - $this->loadUserData($config); + $this->loadUserData($config); if($this->_userFile!==null) { if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) @@ -125,7 +123,7 @@ class TUserManager extends TModule implements IUserManager } $this->_initialized=true; } - + /* * Loads user/role information * @param mixed the variable containing the user information @@ -389,7 +387,6 @@ class TUserManager extends TModule implements IUserManager * - SHA1: the password is recorded as the SHA1 hash value of the original password * * @author Qiang Xue <qiang.xue@gmail.com> - * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Security * @since 3.0.4 */ |