Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
Dwoo
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Common
Dwoo
Commits
43cee22e
Commit
43cee22e
authored
Sep 01, 2010
by
Jordi Boggiano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed extends bug when calling {extends} with parenthesis
parent
9fb7da89
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
extends.php
lib/plugins/builtin/functions/extends.php
+1
-1
No files found.
CHANGELOG
View file @
43cee22e
...
...
@@ -28,6 +28,7 @@
it
with
caution
*
Fixed
PHP
parse
errors
being
generated
in
compiled
templates
when
{
dynamic
}
was
nested
*
Fixed
extends
bug
when
calling
{
extends
}
with
parenthesis
*
Fixed
a
double
escaping
bug
when
a
variable
was
assigned
to
another
one
*
Added
$
this
->
viewParam
support
to
ZendFramework
adapter
through
a
Dwoo_Adapters_ZendFramework_Dwoo
class
that
extends
Dwoo
,
you
should
use
...
...
lib/plugins/builtin/functions/extends.php
View file @
43cee22e
...
...
@@ -74,7 +74,7 @@ class Dwoo_Plugin_extends extends Dwoo_Plugin implements Dwoo_ICompilable
}
$inheritanceTree
[]
=
$newParent
;
if
(
preg_match
(
'/^'
.
self
::
$l
.
'extends
\s+(?:file=)?\s*((["\']).+?\2|\S+?)
'
.
self
::
$r
.
'/i'
,
$parent
->
getSource
(),
$match
))
{
if
(
preg_match
(
'/^'
.
self
::
$l
.
'extends
(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)\s*?
'
.
self
::
$r
.
'/i'
,
$parent
->
getSource
(),
$match
))
{
$curPath
=
dirname
(
$identifier
)
.
DIRECTORY_SEPARATOR
;
if
(
isset
(
$match
[
2
])
&&
$match
[
2
]
==
'"'
)
{
$file
=
'"'
.
str_replace
(
'"'
,
'\\"'
,
substr
(
$match
[
1
],
1
,
-
1
))
.
'"'
;
...
...
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