From 496a6ef4ee9718ebb702b6b8f43c002ff5efd433 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Tue, 2 Oct 2012 08:33:24 +0000 Subject: [PATCH] // Fixed JS and CSS path on admin when redirect from login git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17670 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Media.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Media.php b/classes/Media.php index 440818ad9..d772f7f7f 100755 --- a/classes/Media.php +++ b/classes/Media.php @@ -224,7 +224,7 @@ class MediaCore if (Context::getContext()->controller->controller_type == 'admin') { $js_uri = preg_replace('/^'.preg_quote(__PS_BASE_URI__, '/').'/', '/', $js_uri); - $js_uri = dirname($_SERVER['REQUEST_URI'].'a').'/..'.$js_uri; + $js_uri = dirname(preg_replace('/\?.+$/', '', $_SERVER['REQUEST_URI']).'a').'/..'.$js_uri; } return $js_uri; @@ -251,7 +251,7 @@ class MediaCore if (Context::getContext()->controller->controller_type == 'admin') { $css_uri = preg_replace('/^'.preg_quote(__PS_BASE_URI__, '/').'/', '/', $css_uri); - $css_uri = dirname($_SERVER['REQUEST_URI'].'a').'/..'.$css_uri; + $css_uri = dirname(preg_replace('/\?.+$/', '', $_SERVER['REQUEST_URI']).'a').'/..'.$css_uri; } return array($css_uri => $css_media_type);