From 3546ec275b0246cf130f320095b725abb1fb2f06 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 10 Nov 2008 01:01:09 +0000
Subject: [PATCH] BUGFIX: Fixed bug with // placement in CMSMenu Director rule
 generation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65502 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMenu.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/code/CMSMenu.php b/code/CMSMenu.php
index 7b220be9..57141bc8 100644
--- a/code/CMSMenu.php
+++ b/code/CMSMenu.php
@@ -33,9 +33,18 @@ class CMSMenu extends Object implements Iterator
 	 */	
 	public static function add_controller($controllerClass) {
 		$controller = singleton($controllerClass);
-		Director::addRules($controller->stat('url_priority', true), 
-			array(Controller::join_links($controller->Link(), $controller->stat('url_rule', true)) => $controllerClass)
-		);
+
+		$link = $controller->Link();
+		if(substr($link,-1) == '/') $link = substr($link,0,-1);
+		$subRule = $controller->stat('url_rule', true);
+		if($subRule[0] == '/') $subRule = substr($subRule,1);
+		$rule = $link . '//' . $subRule;
+		
+		Director::addRules($controller->stat('url_priority', true), array(
+			$rule => $controllerClass
+			
+		));
+		
 		return self::add_menu_item(
 			$controllerClass, 
 			$controller->getMenuTitle(),