Prevent SQL error when forcing download. MDL-15921 ; merged from 19_STABLE

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 9f5ac4679b82b3f1a17260ef5b1f44adee8674ef..99abd2e7335c20e0bfbbdbf9f5e52c2d58e3ed89 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -135,6 +135,7 @@ class resource_file extends resource_base {
         $alloptions = $RESOURCE_WINDOW_OPTIONS;
 
         if ($resource->forcedownload) {
+            $resource->popup = '';
             $resource->options = 'forcedownload';
 
         } else if ($resource->windowpopup) {