Fix remap dir for CSS minimizer

diff --git a/core/css/styles.css b/core/css/styles.css
index 186c11b4ffe91f1fc7f114024c6f4cb8c701a2b2..b6b5918d653d4a1cc86e1f960a582df37384f4a1 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -134,7 +134,7 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
-.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
+.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
 .separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
 
 a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px }

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 3d1196390e2d3b6d9c4abcad0383f4382599fd6a..4637417579e83efdc7fd918b9d245665e949b07a 100644 (file)
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -63,7 +63,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
                                $css = str_replace('%webroot%', $webroot, $css);
                        }
                        $remote = $file_info[1];
-                       $remote .= '../';
+                       $remote .= '/';
                        $remote .= dirname($file_info[2]);
                        $css_out .= CSSMin::remap($css, dirname($file), $remote, true);
                }