Commit c6da47d8 by Qiang Xue

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

Conflicts: framework/yii/logging/ProfileTarget.php
parents bf05ee29 6d6fea47
...@@ -70,7 +70,7 @@ class CProfileLogRoute extends CWebLogRoute ...@@ -70,7 +70,7 @@ class CProfileLogRoute extends CWebLogRoute
public function processLogs($logs) public function processLogs($logs)
{ {
$app = \Yii::$app; $app = \Yii::$app;
if (!($app instanceof CWebApplication) || $app->getRequest()->getIsAjax()) if (!($app instanceof \yii\web\Application) || $app->getRequest()->getIsAjax())
return; return;
if ($this->getReport() === 'summary') if ($this->getReport() === 'summary')
......
...@@ -58,7 +58,7 @@ class CompareValidator extends Validator ...@@ -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 the value being compared with.
* - `<=`: validates to see if the value being validated is less than or equal to 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 * @var string the user-defined error message. It may contain the following placeholders which
* will be replaced accordingly by the validator: * will be replaced accordingly by the validator:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment