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

Correct errors from differening behaviour between 3.0 and 3.1

Browse Source
This commit is contained in:
Simon Welsh 2014-03-30 18:55:44 +13:00
parent c59cf624df
commit 6db96eac8f
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/view/SSViewerCacheBlockTest.php
View File

@ -24,7 +24,7 @@ class SSViewerCacheBlockTest_VersionedModel extends DataObject implements TestOn
protected $entropy = 'default'; protected $entropy = 'default';
public static $extensions = array( private static $extensions = array(
"Versioned('Stage', 'Live')" "Versioned('Stage', 'Live')"
); );

13
view/SSTemplateParser.php
View File

@ -2946,10 +2946,10 @@ class SSTemplateParser extends Parser implements TemplateParser {
// Embed the code necessary to evaluate the globalKey directly into the template, // Embed the code necessary to evaluate the globalKey directly into the template,
// so that SSTemplateParser only needs to be called during template regeneration. // so that SSTemplateParser only needs to be called during template regeneration.
// Warning: If the global key is changed, it's necessary to flush the template cache. // Warning: If the global key is changed, it's necessary to flush the template cache.
$parser = new SSTemplateParser($globalKey); $parser = Injector::inst()->get('SSTemplateParser', false);
$result = $parser->match_Template(); $result = $parser->compileString($globalKey, '', false, false);
if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $parser); if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $parser);
$res['php'] .= $result['php'] . PHP_EOL; $res['php'] .= $result . PHP_EOL;
} }
$res['php'] .= 'return $val;' . PHP_EOL; $res['php'] .= 'return $val;' . PHP_EOL;
$res['php'] .= '};' . PHP_EOL; $res['php'] .= '};' . PHP_EOL;
@ -4703,9 +4703,10 @@ class SSTemplateParser extends Parser implements TemplateParser {
* @param $string The source of the template * @param $string The source of the template
* @param string $templateName The name of the template, normally the filename the template source was loaded from * @param string $templateName The name of the template, normally the filename the template source was loaded from
* @param bool $includeDebuggingComments True is debugging comments should be included in the output * @param bool $includeDebuggingComments True is debugging comments should be included in the output
* @param bool $topTemplate True if this is a top template, false if it's just a template
* @return mixed|string The php that, when executed (via include or exec) will behave as per the template source * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source
*/ */
public function compileString($string, $templateName = "", $includeDebuggingComments=false) { public function compileString($string, $templateName = "", $includeDebuggingComments=false, $topTemplate = true) {
if (!trim($string)) { if (!trim($string)) {
$code = ''; $code = '';
} }
@ -4719,7 +4720,11 @@ class SSTemplateParser extends Parser implements TemplateParser {
if(substr($string, 0,3) == pack("CCC", 0xef, 0xbb, 0xbf)) $this->pos = 3; if(substr($string, 0,3) == pack("CCC", 0xef, 0xbb, 0xbf)) $this->pos = 3;
// Match the source against the parser // Match the source against the parser
if ($topTemplate) {
$result = $this->match_TopTemplate(); $result = $this->match_TopTemplate();
} else {
$result = $this->match_Template();
}
if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $this); if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $this);
// Get the result // Get the result

13
view/SSTemplateParser.php.inc
View File

@ -681,10 +681,10 @@ class SSTemplateParser extends Parser implements TemplateParser {
// Embed the code necessary to evaluate the globalKey directly into the template, // Embed the code necessary to evaluate the globalKey directly into the template,
// so that SSTemplateParser only needs to be called during template regeneration. // so that SSTemplateParser only needs to be called during template regeneration.
// Warning: If the global key is changed, it's necessary to flush the template cache. // Warning: If the global key is changed, it's necessary to flush the template cache.
$parser = new SSTemplateParser($globalKey); $parser = Injector::inst()->get('SSTemplateParser', false);
$result = $parser->match_Template(); $result = $parser->compileString($globalKey, '', false, false);
if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $parser); if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $parser);
$res['php'] .= $result['php'] . PHP_EOL; $res['php'] .= $result . PHP_EOL;
} }
$res['php'] .= 'return $val;' . PHP_EOL; $res['php'] .= 'return $val;' . PHP_EOL;
$res['php'] .= '};' . PHP_EOL; $res['php'] .= '};' . PHP_EOL;
@ -1157,9 +1157,10 @@ class SSTemplateParser extends Parser implements TemplateParser {
* @param $string The source of the template * @param $string The source of the template
* @param string $templateName The name of the template, normally the filename the template source was loaded from * @param string $templateName The name of the template, normally the filename the template source was loaded from
* @param bool $includeDebuggingComments True is debugging comments should be included in the output * @param bool $includeDebuggingComments True is debugging comments should be included in the output
* @param bool $topTemplate True if this is a top template, false if it's just a template
* @return mixed|string The php that, when executed (via include or exec) will behave as per the template source * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source
*/ */
public function compileString($string, $templateName = "", $includeDebuggingComments=false) { public function compileString($string, $templateName = "", $includeDebuggingComments=false, $topTemplate = true) {
if (!trim($string)) { if (!trim($string)) {
$code = ''; $code = '';
} }
@ -1173,7 +1174,11 @@ class SSTemplateParser extends Parser implements TemplateParser {
if(substr($string, 0,3) == pack("CCC", 0xef, 0xbb, 0xbf)) $this->pos = 3; if(substr($string, 0,3) == pack("CCC", 0xef, 0xbb, 0xbf)) $this->pos = 3;
// Match the source against the parser // Match the source against the parser
if ($topTemplate) {
$result = $this->match_TopTemplate(); $result = $this->match_TopTemplate();
} else {
$result = $this->match_Template();
}
if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $this); if(!$result) throw new SSTemplateParseException('Unexpected problem parsing template', $this);
// Get the result // Get the result