Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
EcomDev_PHPUnit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Open
EcomDev_PHPUnit
Commits
5b0db121
Commit
5b0db121
authored
Aug 30, 2012
by
Ivan Chepurnyi
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into dev
parents
b7e7064c
cfe7c7f5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/code/community/EcomDev/PHPUnit/Model/Layout.php
app/code/community/EcomDev/PHPUnit/Model/Layout.php
+1
-1
No files found.
app/code/community/EcomDev/PHPUnit/Model/Layout.php
View file @
5b0db121
...
@@ -362,7 +362,7 @@ class EcomDev_PHPUnit_Model_Layout
...
@@ -362,7 +362,7 @@ class EcomDev_PHPUnit_Model_Layout
{
{
$this
->
_collectedBlock
=
null
;
$this
->
_collectedBlock
=
null
;
parent
::
_generateBlock
(
$node
,
$parent
);
parent
::
_generateBlock
(
$node
,
$parent
);
if
(
$this
->
_collectedBlock
!==
null
)
{
if
(
$this
->
_collectedBlock
)
{
$target
=
$this
->
_collectedBlock
->
getNameInLayout
();
$target
=
$this
->
_collectedBlock
->
getNameInLayout
();
$params
=
array
();
$params
=
array
();
if
(
isset
(
$node
[
'as'
]))
{
if
(
isset
(
$node
[
'as'
]))
{
...
...
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