Browse Source

Merge branch 'master' of github.com:yiisoft/yii2

Conflicts:
	framework/yii/logging/ProfileTarget.php
tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
c6da47d83e
  1. 2
      framework/yii/logging/ProfileTarget.php
  2. 2
      framework/yii/validators/CompareValidator.php

2
framework/yii/logging/ProfileTarget.php

@ -70,7 +70,7 @@ class CProfileLogRoute extends CWebLogRoute
public function processLogs($logs)
{
$app = \Yii::$app;
if (!($app instanceof CWebApplication) || $app->getRequest()->getIsAjax())
if (!($app instanceof \yii\web\Application) || $app->getRequest()->getIsAjax())
return;
if ($this->getReport() === 'summary')

2
framework/yii/validators/CompareValidator.php

@ -58,7 +58,7 @@ class CompareValidator extends Validator
* - `<`: validates to see if the value being validated is less than the value being compared with.
* - `<=`: validates to see if the value being validated is less than or equal to the value being compared with.
*/
public $operator = '=';
public $operator = '==';
/**
* @var string the user-defined error message. It may contain the following placeholders which
* will be replaced accordingly by the validator:

Loading…
Cancel
Save