dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed JS and CSS path on admin when redirect from login

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17670 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-10-02 08:33:24 +00:00
parent 187b6c0781
commit 496a6ef4ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Media.php
+2 -2
View File
@@ -224,7 +224,7 @@ class MediaCore
if (Context::getContext()->controller->controller_type == 'admin') if (Context::getContext()->controller->controller_type == 'admin')
{ {
$js_uri = preg_replace('/^'.preg_quote(__PS_BASE_URI__, '/').'/', '/', $js_uri); $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; return $js_uri;
@@ -251,7 +251,7 @@ class MediaCore
if (Context::getContext()->controller->controller_type == 'admin') if (Context::getContext()->controller->controller_type == 'admin')
{ {
$css_uri = preg_replace('/^'.preg_quote(__PS_BASE_URI__, '/').'/', '/', $css_uri); $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); return array($css_uri => $css_media_type);