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
b3460fc3
Commit
b3460fc3
authored
May 18, 2012
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
b3e6169a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ActiveFinder.php
framework/db/ar/ActiveFinder.php
+1
-1
ActiveRecord.php
framework/db/ar/ActiveRecord.php
+1
-1
ArrayHelper.php
framework/util/ArrayHelper.php
+1
-1
No files found.
framework/db/ar/ActiveFinder.php
View file @
b3460fc3
...
@@ -300,7 +300,7 @@ class ActiveFinder extends \yii\base\Object
...
@@ -300,7 +300,7 @@ class ActiveFinder extends \yii\base\Object
}
}
if
(
$config
instanceof
\Closure
)
{
if
(
$config
instanceof
\Closure
)
{
call_user_func
(
$config
,
$child
->
query
);
$config
(
$child
->
query
);
}
else
{
}
else
{
foreach
(
$config
as
$name
=>
$value
)
{
foreach
(
$config
as
$name
=>
$value
)
{
$child
->
query
->
$name
=
$value
;
$child
->
query
->
$name
=
$value
;
...
...
framework/db/ar/ActiveRecord.php
View file @
b3460fc3
...
@@ -574,7 +574,7 @@ abstract class ActiveRecord extends Model
...
@@ -574,7 +574,7 @@ abstract class ActiveRecord extends Model
}
}
$relation
=
clone
$relation
;
$relation
=
clone
$relation
;
if
(
$params
instanceof
\Closure
)
{
if
(
$params
instanceof
\Closure
)
{
call_user_func
(
$params
,
$relation
);
$params
(
$relation
);
}
else
{
}
else
{
foreach
(
$params
as
$name
=>
$value
)
{
foreach
(
$params
as
$name
=>
$value
)
{
$relation
->
$name
=
$value
;
$relation
->
$name
=
$value
;
...
...
framework/util/ArrayHelper.php
View file @
b3460fc3
...
@@ -77,7 +77,7 @@ class ArrayHelper
...
@@ -77,7 +77,7 @@ class ArrayHelper
public
static
function
get
(
$array
,
$key
,
$default
=
null
)
public
static
function
get
(
$array
,
$key
,
$default
=
null
)
{
{
if
(
$key
instanceof
\Closure
)
{
if
(
$key
instanceof
\Closure
)
{
return
call_user_func
(
$key
,
$array
,
$default
);
return
$key
(
$array
,
$default
);
}
elseif
(
is_array
(
$array
))
{
}
elseif
(
is_array
(
$array
))
{
return
isset
(
$array
[
$key
])
||
array_key_exists
(
$key
,
$array
)
?
$array
[
$key
]
:
$default
;
return
isset
(
$array
[
$key
])
||
array_key_exists
(
$key
,
$array
)
?
$array
[
$key
]
:
$default
;
}
else
{
}
else
{
...
...
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