Merge branch 'master' of https://github.com/jcwmoore/ampache.git

nan4k7 · Nov 20, 2013 · 5643d26 · 5643d26
2 parents 4f6efeb + ead36d9
commit 5643d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/image.php b/image.php
@@ -120,6 +120,7 @@
 
     // Send the headers and output the image
     $browser = new Horde_Browser();
+    header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 604800));
     $browser->downloadHeaders($filename, $mime, true);
     echo $image;
 }
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
@@ -92,7 +92,7 @@
 <div class="np_group" id="np_group_3">
   <div class="np_cell cel_albumart">
       <a href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>" onclick="TINY.box.show({image:'<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>',boxid:'frameless',animate:true}); return false;">
-        <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($media->f_album_full); ?>" title="<?php echo scrub_out($media->f_album_full); ?>" height="80" width="80" />
+        <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;thumb=1" alt="<?php echo scrub_out($media->f_album_full); ?>" title="<?php echo scrub_out($media->f_album_full); ?>" height="80" width="80" />
       </a>
   </div>
 </div>