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

Merge branch 'release/0.2.7'

Browse Source
This commit is contained in:
Justin Hileman
2010-08-03 05:01:58 -04:00
parent 0b542e4e08 ec562fea09
commit fe1493c6e7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+4 -4
View File
@@ -205,7 +205,7 @@ class Mustache {
protected function _renderSection($template) { protected function _renderSection($template) {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$regex = '/' . $otag . '(\\^|\\#)\\s*(.+?)\\s*' . $ctag . '\\s*([\\s\\S]+?)' . $otag . '\\/\\s*\\2\\s*' . $ctag . '\\s*/m'; $regex = '/' . $otag . '(\\^|\\#)\\s*(.+?)\\s*' . $ctag . '\\s*([\\s\\S]+?)' . $otag . '\\/\\s*\\2\\s*' . $ctag . '\\s*/ms';
$matches = array(); $matches = array();
while (preg_match($regex, $template, $matches, PREG_OFFSET_CAPTURE)) { while (preg_match($regex, $template, $matches, PREG_OFFSET_CAPTURE)) {
@@ -284,7 +284,7 @@ class Mustache {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$regex = '/' . $otag . '%\\s*([\\w_-]+)((?: [\\w]+=[\\w]+)*)\\s*' . $ctag . '\\n?/'; $regex = '/' . $otag . '%\\s*([\\w_-]+)((?: [\\w]+=[\\w]+)*)\\s*' . $ctag . '\\n?/s';
return preg_replace_callback($regex, array($this, '_renderPragma'), $template); return preg_replace_callback($regex, array($this, '_renderPragma'), $template);
} }
@@ -385,7 +385,7 @@ class Mustache {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/"; $this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s";
$html = ''; $html = '';
$matches = array(); $matches = array();
@@ -523,7 +523,7 @@ class Mustache {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/"; $this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s";
return ''; return '';
} }