Prechádzať zdrojové kódy

Updating _renderTag logic around leftover section tags.

Exceptions are now thrown by _renderSections, so anything left over by the time _renderTag executes should just be discarded.
Justin Hileman 15 rokov pred
rodič
commit
225a32d5bf
1 zmenil súbory, kde vykonal 6 pridanie a 15 odobranie
  1. 6 15
      Mustache.php

+ 6 - 15
Mustache.php

@@ -475,21 +475,6 @@ class Mustache {
 	 */
 	protected function _renderTag($modifier, $tag_name) {
 		switch ($modifier) {
-			case '#':
-			case '^':
-				if ($this->_throwsException(MustacheException::UNCLOSED_SECTION)) {
-					throw new MustacheException('Unclosed section: ' . $tag_name, MustacheException::UNCLOSED_SECTION);
-				} else {
-					return '';
-				}
-				break;
-			case '/':
-				if ($this->_throwsException(MustacheException::UNEXPECTED_CLOSE_SECTION)) {
-					throw new MustacheException('Unexpected close section: ' . $tag_name, MustacheException::UNEXPECTED_CLOSE_SECTION);
-				} else {
-					return '';
-				}
-				break;
 			case '=':
 				return $this->_changeDelimiter($tag_name);
 				break;
@@ -508,6 +493,12 @@ class Mustache {
 					return $this->_renderUnescaped($tag_name);
 				}
 				break;
+			case '#':
+			case '^':
+			case '/':
+				// remove any leftovers from _renderSections
+				return '';
+				break;
 		}
 
 		if ($this->_hasPragma(self::PRAGMA_UNESCAPED)) {