diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2014-01-06 22:41:46 +0100 |
|---|---|---|
| committer | David <ottodavid@gmx.net> | 2014-08-21 17:20:54 +0200 |
| commit | fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (patch) | |
| tree | 80fff53aa0d9c60612bc2ca690a46194e9c160cf /framework/Util/TLogRouter.php | |
| parent | 48577f63f414dc3078abc4bdc93bde932fe666a6 (diff) | |
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
Diffstat (limited to 'framework/Util/TLogRouter.php')
| -rw-r--r-- | framework/Util/TLogRouter.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/Util/TLogRouter.php b/framework/Util/TLogRouter.php index 32273c0c..ef28d61a 100644 --- a/framework/Util/TLogRouter.php +++ b/framework/Util/TLogRouter.php @@ -4,7 +4,7 @@ * * @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: TLogRouter.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Util @@ -29,7 +29,7 @@ Prado::using('System.Data.TDbConnection'); * </code> * PHP configuration style: * <code> - * + * * </code> * You can specify multiple routes with different filtering conditions and different * targets, even if the routes are of the same type. @@ -128,8 +128,8 @@ class TLogRouter extends TModule /** * Adds a TLogRoute instance to the log router. - * - * @param TLogRoute $route + * + * @param TLogRoute $route * @throws TInvalidDataTypeException if the route object is invalid */ public function addRoute($route) @@ -639,7 +639,7 @@ class TBrowserLogRoute extends TLogRoute * @var string css class for indentifying the table structure in the dom tree */ private $_cssClass=null; - + public function processLogs($logs) { if(empty($logs) || $this->getApplication()->getMode()==='Performance') return; @@ -664,7 +664,7 @@ class TBrowserLogRoute extends TLogRoute } $response->write($this->renderFooter()); } - + /** * @param string the css class of the control */ |