Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'zbuc/master' into dev

Browse Source
This commit is contained in:
Justin Hileman
2012-01-15 09:54:35 -08:00
parent 53630208b6 1c2e9a22d3
commit 98e37ef4bf
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+6
View File
@@ -403,7 +403,10 @@ class Mustache {
$options_string = $matches['options_string']; $options_string = $matches['options_string'];
if (!in_array($pragma_name, $this->_pragmasImplemented)) { if (!in_array($pragma_name, $this->_pragmasImplemented)) {
if($this->_throwsException(MustacheException::UNKNOWN_PRAGMA))
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA); throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
else
return '';
} }
$options = array(); $options = array();
@@ -448,7 +451,10 @@ class Mustache {
*/ */
protected function _getPragmaOptions($pragma_name) { protected function _getPragmaOptions($pragma_name) {
if (!$this->_hasPragma($pragma_name)) { if (!$this->_hasPragma($pragma_name)) {
if($this->_throwsException(MustacheException::UNKNOWN_PRAGMA))
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA); throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
else
return array();
} }
return (is_array($this->_localPragmas[$pragma_name])) ? $this->_localPragmas[$pragma_name] : array(); return (is_array($this->_localPragmas[$pragma_name])) ? $this->_localPragmas[$pragma_name] : array();