From 2fe82be5a30ca49ab755984178e3fec0953a61b3 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 19 Mar 2008 06:41:30 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3977 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/menu/menu.admin.controller.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 6ac5ed39e..0d928b989 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -399,7 +399,8 @@ $url = str_replace(array('&','"','<','>'),array('&','"','<','>'),$node->url); if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url)) { $href = getUrl('','mid',$node->url); - $href = str_replace(Context::getRequestUri(),'/',$href); + $pos = strpos($href, $_SERVER['HTTP_HOST']); + if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST'])); } else $href = $url; $open_window = $node->open_window; $expand = $node->expand; @@ -491,7 +492,8 @@ $url = str_replace(array('&','"','<','>'),array('&','"','<','>'),$node->url); if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url)) { $href = getUrl('','mid',$node->url); - $href = str_replace(Context::getRequestUri(),'/',$href); + $pos = strpos($href, $_SERVER['HTTP_HOST']); + if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST'])); } else $href = $url; $open_window = $node->open_window; $normal_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$node->normal_btn);