From: stronk7 <stronk7>
Date: Tue, 26 Aug 2008 23:02:58 +0000 (+0000)
Subject: Prevent SQL error when forcing download. MDL-15921 ; merged from 19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7facd18e7d447966c996370b4b0c51b002517e1d;p=moodle.git

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 9f5ac4679b..99abd2e733 100644
--- 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) {