MDL-46416 group: Use a revision number for group pictures

diff --git a/group/lib.php b/group/lib.php
index c338911..e1645b9 100644 (file)
--- a/group/lib.php
+++ b/group/lib.php
@@ -347,9 +347,9 @@ function groups_update_group_icon($group, $data, $editform) {
 
     //TODO: it would make sense to allow picture deleting too (skodak)
     if ($iconfile = $editform->save_temp_file('imagefile')) {
-        if (process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) {
-            $DB->set_field('groups', 'picture', 1, array('id'=>$group->id));
-            $group->picture = 1;
+        if ($rev = process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) {
+            $DB->set_field('groups', 'picture', $rev, array('id'=>$group->id));
+            $group->picture = $rev;
         } else {
             $fs->delete_area_files($context->id, 'group', 'icon', $group->id);
             $DB->set_field('groups', 'picture', 0, array('id'=>$group->id));

diff --git a/lib/weblib.php b/lib/weblib.php
index ee5b31a..930d964 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2263,6 +2263,7 @@ function print_group_picture($group, $courseid, $large=false, $return=false, $li
     }
 
     $grouppictureurl = moodle_url::make_pluginfile_url($context->id, 'group', 'icon', $group->id, '/', $file);
+    $grouppictureurl->param('rev', $group->picture);
     $output .= '<img class="grouppicture" src="'.$grouppictureurl.'"'.
         ' alt="'.s(get_string('group').' '.$group->name).'" title="'.s($group->name).'"/>';