Remove extension from cache busters of non-combined JS/CSS links (fol…

…lows 2078).
gallery · Jul 9, 2013 · e8752f6 · e8752f6
1 parent b8899a3
commit e8752f6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
@@ -206,11 +206,12 @@ public function get_combined($type, $group=null) {
         }
       } else {
         // Don't combine - just return the CSS and JS links (with the key as a cache buster).
+        $key_base = substr($key, 0, (($type == "css") ? -4 : -3));  // key without extension
         foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
           if ($type == "css") {
-            $buf .= html::stylesheet("$path?m=$key", "screen,print,projection", false);
+            $buf .= html::stylesheet("$path?m=$key_base", "screen,print,projection", false);
           } else {
-            $buf .= html::script("$path?m=$key", false);
+            $buf .= html::script("$path?m=$key_base", false);
           }
         }
       }