Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
c6da47d8
Commit
c6da47d8
authored
Jun 06, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:yiisoft/yii2
Conflicts: framework/yii/logging/ProfileTarget.php
parents
bf05ee29
6d6fea47
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ProfileTarget.php
framework/yii/logging/ProfileTarget.php
+1
-1
CompareValidator.php
framework/yii/validators/CompareValidator.php
+1
-1
No files found.
framework/yii/logging/ProfileTarget.php
View file @
c6da47d8
...
@@ -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
CWeb
Application
)
||
$app
->
getRequest
()
->
getIsAjax
())
if
(
!
(
$app
instanceof
\yii\web\
Application
)
||
$app
->
getRequest
()
->
getIsAjax
())
return
;
return
;
if
(
$this
->
getReport
()
===
'summary'
)
if
(
$this
->
getReport
()
===
'summary'
)
...
...
framework/yii/validators/CompareValidator.php
View file @
c6da47d8
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment