Index: branches/5.3.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -N -r15902 -r15911
--- branches/5.3.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 15902)
+++ branches/5.3.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 15911)
@@ -1,6 +1,6 @@
TagInfo($this->Stack[$this->Level]->Tag), 0, null, $error_tag);
-
- return false;
}
// appending text data after last tag (after its closing pos),
@@ -256,8 +254,6 @@
if (!preg_match('/([^_ \t\r\n]*)[_]?([^ \t\r\n]*)[ \t\r\n]*(.*)$$/s', $tag['tag'], $parts)) {
// this is virtually impossible, but just in case
throw new ParserException('Incorrect tag format: ' . $tag['tag'], 0, null, $tag);
-
- return false;
}
$splited['prefix'] = $parts[2] ? $parts[1] : '__auto__';
@@ -309,8 +305,6 @@
$error_msg = 'Closing tag without an opening: ' . $this->TagInfo($tag) . ' - probably opening tag was removed or nested tags error';
throw new ParserException($error_msg, 0, null, $tag);
-
- return false;
}
if ($this->Stack[$this->Level]->Tag['name'] != $tag['name']) {
@@ -320,8 +314,6 @@
opening tag at current nesting level
(' . $this->TagInfo($opening_tag) . ' opened at line ' . $opening_tag['line'] . ')';
throw new ParserException($error_msg, 0, null, $tag);
-
- return false;
}
$o .= $this->Stack[$this->Level]->Close($tag); // DO NOT use $this->Level-- here because it's used inside Close
@@ -332,8 +324,6 @@
if (!$tag['is_closing']) {
$error_msg = 'Tag without a handler: ' . $this->TagInfo($tag) . ' - probably missing <empty /> tag closing';
throw new ParserException($error_msg, 0, null, $tag);
-
- return false;
}
if ($this->Level > 0) $o .= $this->Stack[$this->Level]->PassThrough($tag);
@@ -404,8 +394,6 @@
if (!is_object($p) || !$p->CheckTag($tag['name'], $tag['prefix'])) {
$error_msg = 'Unknown tag: ' . $this->TagInfo($tag) . ' - incorrect tag name or prefix';
throw new ParserException($error_msg, 0, null, $tag);
-
- return false;
}
}
@@ -710,8 +698,6 @@
$error_msg = 'Rendering of undefined element ' . $params['name'] . '';
throw new ParserException($error_msg, 0, null, $error_tag);
-
- return false;
}
$m_processor =& $this->GetProcessor('m');
@@ -1203,4 +1189,4 @@
$this->line = $tag['line'];
}
}
-}
\ No newline at end of file
+}