tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Sync template-parser files

Browse Source 
The template-parser files were not in sync, there were some lines added
in SSTemplateParser.php from 3334eafcb1c42b917dcafe46d87ea32f2b1014b8
and 0a9f3b75a9195092ff7c42265ec066339d8f8aa3 , I readded those parts
into the SSTemplateParser-include-file and recreated the
SSTemplateParser.php to get to a synced state...
This commit is contained in:
s-m 2013-04-05 19:12:54 +02:00
parent 1dda9ae45f
commit 14de34cb9b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/SSTemplateParser.php
View File

@ -3913,7 +3913,7 @@ class SSTemplateParser extends Parser {
/* Comment: "<%--" (!"--%>" /./)+ "--%>" */ /* Comment: "<%--" (!"--%>" /(?s)./)+ "--%>" */
protected $match_Comment_typestack = array('Comment'); protected $match_Comment_typestack = array('Comment');
function match_Comment ($stack = array()) { function match_Comment ($stack = array()) {
$matchrule = "Comment"; $result = $this->construct($matchrule, $matchrule, null); $matchrule = "Comment"; $result = $this->construct($matchrule, $matchrule, null);

4
view/SSTemplateParser.php.inc
View File

@ -804,7 +804,7 @@ class SSTemplateParser extends Parser {
* @deprecated * @deprecated
*/ */
function ClosedBlock_Handle_Control(&$res) { function ClosedBlock_Handle_Control(&$res) {
Deprecation::notice('3.1', 'Use <% with %> or <% loop %> instead.'); Deprecation::notice('3.1', '<% control %> is deprecated. Use <% with %> or <% loop %> instead.');
return $this->ClosedBlock_Handle_Loop($res); return $this->ClosedBlock_Handle_Loop($res);
} }
@ -1002,7 +1002,7 @@ class SSTemplateParser extends Parser {
// non-dynamically calculated // non-dynamically calculated
$text = preg_replace( $text = preg_replace(
'/href\s*\=\s*\"\#/', '/href\s*\=\s*\"\#/',
'href="\' . (SSViewer::$options[\'rewriteHashlinks\'] ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") . 'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
\'#', \'#',
$text $text
); );