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
0319c29f
Commit
0319c29f
authored
Nov 03, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5895 from otsec/array-helper-to-array-recursive-fix
Fix for recursive calls ArrayHelper::toArray() with objects
parents
58e780ff
bcd23926
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
BaseArrayHelper.php
framework/helpers/BaseArrayHelper.php
+1
-1
No files found.
framework/CHANGELOG.md
View file @
0319c29f
...
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
...
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.
0.1 under development
2.
0.1 under development
-----------------------
-----------------------
-
Bug #5893:
`yii\helpers\ArrayHelper::toArray()`
now applies
`$properties`
parameter for converting descending objects in recursive calls (otsec)
-
Bug #4471:
`yii\caching\ApcCache::getValues()`
now returns array in case of APC is installed but not enabled in CLI mode (samdark, cebe)
-
Bug #4471:
`yii\caching\ApcCache::getValues()`
now returns array in case of APC is installed but not enabled in CLI mode (samdark, cebe)
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5570:
`yii\bootstrap\Tabs`
would throw an exception if
`content`
is not set for one of its
`items`
(RomeroMsk)
-
Bug #5570:
`yii\bootstrap\Tabs`
would throw an exception if
`content`
is not set for one of its
`items`
(RomeroMsk)
...
...
framework/helpers/BaseArrayHelper.php
View file @
0319c29f
...
@@ -81,7 +81,7 @@ class BaseArrayHelper
...
@@ -81,7 +81,7 @@ class BaseArrayHelper
}
}
}
}
return
$recursive
?
static
::
toArray
(
$result
)
:
$result
;
return
$recursive
?
static
::
toArray
(
$result
,
$properties
)
:
$result
;
}
}
}
}
if
(
$object
instanceof
Arrayable
)
{
if
(
$object
instanceof
Arrayable
)
{
...
...
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