From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 6 Jan 2014 22:41:46 +0100
Subject: Happy 2014! (cherry picked from commit
 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php
---
 framework/Security/TUserManager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/Security/TUserManager.php')

diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index 5cb716dd..8af5a11b 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
@@ -108,7 +108,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 +125,7 @@ class TUserManager extends TModule implements IUserManager
 		}
 		$this->_initialized=true;
 	}
-	
+
 	/*
 	 * Loads user/role information
 	 * @param mixed the variable containing the user information
-- 
cgit v1.2.3