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/TApplication.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'framework/TApplication.php')

diff --git a/framework/TApplication.php b/framework/TApplication.php
index 7769a9e0..6c2b11b0 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.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: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $
  * @package System
@@ -131,7 +131,7 @@ class TApplication extends TComponent
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_XML='.xml';	
+	const CONFIG_FILE_EXT_XML='.xml';
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
@@ -296,7 +296,7 @@ class TApplication extends TComponent
 	 * @var TApplicationMode application mode
 	 */
 	private $_mode=TApplicationMode::Debug;
-	
+
 	/**
 	 * @var string Customizable page service ID
 	 */
@@ -334,7 +334,7 @@ class TApplication extends TComponent
 		$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new TMap;
 		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
-		
+
 		Prado::setPathOfAlias('Application',$this->_basePath);
 	}
 
@@ -521,7 +521,7 @@ class TApplication extends TComponent
 	{
 		$this->_id=$value;
 	}
-	
+
 	/**
 	 * @return string page service ID
 	 */
@@ -609,7 +609,7 @@ class TApplication extends TComponent
 	{
 		$this->_configType = $value;
 	}
-	
+
 	/**
 	 * @return string the application configuration type. default is 'xml'
 	 */
@@ -628,7 +628,7 @@ class TApplication extends TComponent
 		}
 		return $this->_configFileExt;
 	}
-	
+
 	/**
 	 * @return string the default configuration file name
 	 */
@@ -999,7 +999,7 @@ class TApplication extends TComponent
 			foreach($config->getProperties() as $name=>$value)
 				$this->setSubProperty($name,$value);
 		}
-		
+
 		if(empty($this->_services))
 			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
 
@@ -1081,7 +1081,7 @@ class TApplication extends TComponent
 
 		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
 			$serviceID=$this->getPageServiceID();
-		
+
 		$this->startService($serviceID);
 	}
 
@@ -1382,7 +1382,7 @@ class TApplicationConfiguration extends TComponent
 				$this->_properties[$name]=$value;
 			}
 			$this->_empty = false;
-		}	
+		}
 
 		if(isset($config['paths']) && is_array($config['paths']))
 			$this->loadPathsPhp($config['paths'],$configPath);
@@ -1395,7 +1395,7 @@ class TApplicationConfiguration extends TComponent
 
 		if(isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
-		
+
 		if(isset($config['includes']) && is_array($config['includes']))
 			$this->loadExternalXml($config['includes'],$configPath);
 	}
@@ -1541,7 +1541,7 @@ class TApplicationConfiguration extends TComponent
 			$properties['id'] = $id;
 			$this->_modules[$id]=array($type,$properties,$module);
 			$this->_empty=false;
-		}	
+		}
 	}
 
 	/**
@@ -1589,7 +1589,7 @@ class TApplicationConfiguration extends TComponent
 			$properties['id'] = $id;
 			$this->_services[$id] = array($type,$properties,$service);
 			$this->_empty = false;
-		}	
+		}
 	}
 
 	/**
-- 
cgit v1.2.3