MDL-15387 Always add_to_log() even in case blocks are showing. Merged from MOODLE_19_...

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index b446c16f44b8896ae9bc0ebc621cdd30d089cefb..03a6bf28aec96eeb89f4f0fd80ca062f94b1fb58 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -50,6 +50,10 @@ function display() {
     $formatoptions = new object();
     $formatoptions->noclean = true;
 
+    // fix for MDL-9021, thanks Etienne Roz
+    // fix for MDL-15387, thanks to John Beedell
+    add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
+
     /// Are we displaying the course blocks?
     if ($this->resource->options == 'showblocks') {
 
@@ -72,9 +76,6 @@ function display() {
         $pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
         $inpopup = optional_param('inpopup', '', PARAM_BOOL);
         
-        // fix for MDL-9021, thanks Etienne Roz
-        add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
-
         if ($resource->popup) {
             if ($inpopup) {                    /// Popup only