Merge branch 'master' of dev.yiisoft.com:yii2

This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Qiang Xue
2011-12-09 09:53:53 -05:00
gitea-unlock(16/)
octicon-diff(16/tw-mr-1) 31 changed files with 1114 additions and 168 deletions

5
framework/logging/ProfileTarget.php
View File

@@ -21,9 +21,7 @@
* </ul>
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CProfileLogRoute.php 3204 2011-05-05 21:36:32Z alexander.makarow $
* @package system.logging
* @since 1.0
* @since 2.0
*/
class CProfileLogRoute extends CWebLogRoute
{
@@ -32,7 +30,6 @@ class CProfileLogRoute extends CWebLogRoute
* If false, the results will be aggregated by categories.
* Defaults to true. Note that this property only affects the summary report
* that is enabled when {@link report} is 'summary'.
* @since 1.0.6
*/
public $groupByToken = true;
/**

6
framework/logging/WebTarget.php
View File

@@ -15,9 +15,7 @@
* or in FireBug console window (if {@link showInFireBug} is set true).
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CWebLogRoute.php 3001 2011-02-24 16:42:44Z alexander.makarow $
* @package system.logging
* @since 1.0
* @since 2.0
*/
class CWebLogRoute extends CLogRoute
{
@@ -32,7 +30,7 @@ class CWebLogRoute extends CLogRoute
* For example if the ajax call expects a json type result any output from the logger will cause ajax call to fail.
*/
public $ignoreAjaxInFireBug = true;
/**
* Displays the log messages.
* @param array $logs list of log messages