Index: branches/RC/core/kernel/nparser/nparser.php
===================================================================
diff -u -r11395 -r11402
--- branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11395)
+++ branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11402)
@@ -162,7 +162,7 @@
 
 	function SplitTag($tag)
 	{
-		if (!preg_match('/([^_ \t\n]*)[_]?([^ \t\n]*)[ \t\n]*(.*)$$/s', $tag['tag'], $parts)) {
+		if (!preg_match('/([^_ \t\r\n]*)[_]?([^ \t\r\n]*)[ \t\r\n]*(.*)$$/s', $tag['tag'], $parts)) {
 			// this is virtually impossible, but just in case
 			$this->Application->handleError(E_USER_ERROR, 'Incorrect tag format: '.$tag['tag'], $tag['file'], $tag['line']);
 			return false;