Merge pull request #442 from DanielMuller/master

Add file extension to combined css/js links for better CDN caching

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 3f59db6a..de282ac9 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -157,7 +157,7 @@ class Gallery_View_Core extends View {
         // 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 @@ class Gallery_View_Core extends View {
 
     return $css;
   }
-}
\ No newline at end of file
+}