From 6eb61e08444ad0819fa99fb8c1d2c719275d0aea Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 26 May 2009 03:45:12 +0000
Subject: [PATCH] BUGFIX: Don't break CMS tree if HTML gets into MenuTitle

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77826 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/SiteTree.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index 7c27a57b1..97dd149b2 100644
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -1764,7 +1764,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 			$tag = '';
 		}
 
-		return ($tag) ? "<$tag>" . $this->MenuTitle . "</" . strtok($tag,' ') . ">" : $this->MenuTitle;
+		$text = Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle));
+		return ($tag) ? "<$tag>" . $text . "</" . strtok($tag,' ') . ">" : $text;
 	}
 
 	/**