MDL-33093 invalidate the thumbnail in the local browser's cache on update

This adds &oid= parameter to the URL of file preview images. The
parameter is supposed to be ignored by draftfile.php and pluginfile.php.
It just holds some unique identification of the original file's
revision. Currently, we use the timestamp of the most recent
modification of the original file.

diff --git a/lib/filelib.php b/lib/filelib.php
index 8d8faf4..09d26b0 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -625,8 +625,8 @@ function file_get_drafarea_files($draftitemid, $filepath = '/') {
                 $item->url = $itemurl->out();
                 $item->thumbnail = $OUTPUT->pix_url(file_extension_icon($item->filename, 32))->out(false);
                 if ($imageinfo = $file->get_imageinfo()) {
-                    $item->realthumbnail = $itemurl->out(false, array('preview' => 'thumb'));
-                    $item->realicon = $itemurl->out(false, array('preview' => 'tinyicon'));
+                    $item->realthumbnail = $itemurl->out(false, array('preview' => 'thumb', 'oid' => $file->get_timemodified()));
+                    $item->realicon = $itemurl->out(false, array('preview' => 'tinyicon', 'oid' => $file->get_timemodified()));
                     $item->image_width = $imageinfo['width'];
                     $item->image_height = $imageinfo['height'];
                 }

diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php
index 64fb1a0..1045731 100644 (file)
--- a/repository/coursefiles/lib.php
+++ b/repository/coursefiles/lib.php
@@ -126,8 +126,8 @@ class repository_coursefiles extends repository {
                     );
                     if ($imageinfo = $child->get_imageinfo()) {
                         $fileurl = new moodle_url($child->get_url());
-                        $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb'));
-                        $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon'));
+                        $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb', 'oid' => $child->get_timemodified()));
+                        $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon', 'oid' => $child->get_timemodified()));
                         $node['image_width'] = $imageinfo['width'];
                         $node['image_height'] = $imageinfo['height'];
                     }

diff --git a/repository/local/lib.php b/repository/local/lib.php
index 93bc5e8..9c204a9 100644 (file)
--- a/repository/local/lib.php
+++ b/repository/local/lib.php
@@ -224,8 +224,8 @@ class repository_local_file {
             if ($imageinfo = $this->fileinfo->get_imageinfo()) {
                 // what a beautiful picture, isn't it
                 $fileurl = new moodle_url($this->fileinfo->get_url());
-                $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb'));
-                $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon'));
+                $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb', 'oid' => $this->fileinfo->get_timemodified()));
+                $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon', 'oid' => $this->fileinfo->get_timemodified()));
                 $node['image_width'] = $imageinfo['width'];
                 $node['image_height'] = $imageinfo['height'];
             }

diff --git a/repository/recent/lib.php b/repository/recent/lib.php
index 25abf00..f7d91d4 100644 (file)
--- a/repository/recent/lib.php
+++ b/repository/recent/lib.php
@@ -139,8 +139,8 @@ class repository_recent extends repository {
                     );
                     if ($imageinfo = $fileinfo->get_imageinfo()) {
                         $fileurl = new moodle_url($fileinfo->get_url());
-                        $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb'));
-                        $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon'));
+                        $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb', 'oid' => $fileinfo->get_timemodified()));
+                        $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon', 'oid' => $fileinfo->get_timemodified()));
                         $node['image_width'] = $imageinfo['width'];
                         $node['image_height'] = $imageinfo['height'];
                     }

diff --git a/repository/user/lib.php b/repository/user/lib.php
index 9d0537a..d15f572 100644 (file)
--- a/repository/user/lib.php
+++ b/repository/user/lib.php
@@ -117,8 +117,8 @@ class repository_user extends repository {
                         );
                         if ($imageinfo = $child->get_imageinfo()) {
                             $fileurl = new moodle_url($child->get_url());
-                            $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb'));
-                            $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon'));
+                            $node['realthumbnail'] = $fileurl->out(false, array('preview' => 'thumb', 'oid' => $child->get_timemodified()));
+                            $node['realicon'] = $fileurl->out(false, array('preview' => 'tinyicon', 'oid' => $child->get_timemodified()));
                             $node['image_width'] = $imageinfo['width'];
                             $node['image_height'] = $imageinfo['height'];
                         }