Merge pull request #442 from DanielMuller/master

Add file extension to combined css/js links for better CDN caching
gallery · Jul 6, 2013 · 7f8e2db · 7f8e2db
2 parents 69baeb1 + 2d20af7
commit 7f8e2db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
@@ -157,7 +157,7 @@ public function get_combined($type, $group=null) {
         // 7 == size, 9 == mtime, see http://php.net/stat
         $key[] = "$path $stats[7] $stats[9]";
       }
-      $key = md5(join(" ", $key));
+      $key = md5(join(" ", $key)) . (($type=="css") ? ".css" : ".js");
 
       if (gallery::allow_css_and_js_combining()) {
         // Combine enabled - if we're at the start of the buffer, add a comment.
@@ -262,4 +262,4 @@ private function process_css($css_file) {
 
     return $css;
   }
-}
+}