MDL-21694 Moving theme strings into plugin space

[moodle.git] / theme / yui_image.php

diff --git a/theme/yui_image.php b/theme/yui_image.php
index b92a010..7a625b8 100644 (file)
--- a/theme/yui_image.php
+++ b/theme/yui_image.php
@@ -37,9 +37,9 @@ if (count($parts) != 2) {
 list($version, $image) = $parts;
 
 if ($version == $CFG->yui3version) {
-    $imagepath = "$CFG->dirroot/lib/yui/$CFG->yui3version/assets/skins/sam/$image";
+    $imagepath = "$CFG->dirroot/lib/yui/$CFG->yui3version/build/assets/skins/sam/$image";
 } else if ($version == $CFG->yui2version) {
-    $imagepath = "$CFG->dirroot/lib/yui/$CFG->yui2version/assets/skins/sam/$image";
+    $imagepath = "$CFG->dirroot/lib/yui/$CFG->yui2version/build/assets/skins/sam/$image";
 } else {
     yui_image_not_found();
 }
@@ -70,11 +70,13 @@ function yui_image_cached($imagepath) {
     header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($imagepath)) .' GMT');
     header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
     header('Pragma: ');
+    header('Cache-Control: max-age=315360000');
     header('Accept-Ranges: none');
     header('Content-Type: '.$mimetype);
     header('Content-Length: '.filesize($imagepath));
 
-    while (@ob_end_flush()); //flush the buffers - save memory and disable sid rewrite
+    // no need to gzip already compressed images ;-)
+
     readfile($imagepath);
     die;
 }