From: stronk7 <stronk7>
Date: Tue, 1 Apr 2008 22:17:58 +0000 (+0000)
Subject: Force download checkbox is not initialized properly, credit goes to skodak. MDL-14010... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c691bebc561a460bcc944886b0357377e6019f3d;p=moodle.git

Force download checkbox is not initialized properly, credit goes to skodak. MDL-14010 ; merged from 19_STABLE
---

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 5fffca58b7..fdfe53fd0c 100644
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -131,7 +131,10 @@ class resource_file extends resource_base {
         global $RESOURCE_WINDOW_OPTIONS;
         $alloptions = $RESOURCE_WINDOW_OPTIONS;
 
-        if ($resource->windowpopup) {
+        if ($resource->forcedownload) {
+            $resource->options = 'forcedownload';
+
+        } else if ($resource->windowpopup) {
             $optionlist = array();
             foreach ($alloptions as $option) {
                 $optionlist[] = $option."=".$resource->$option;
@@ -162,10 +165,6 @@ class resource_file extends resource_base {
             unset($resource->$parametername);
         }
 
-        if ($resource->forcedownload) {
-            $resource->options = 'forcedownload';
-        }
-
         $resource->alltext = implode(',', $optionlist);
     }
 
@@ -664,7 +663,10 @@ class resource_file extends resource_base {
 
     function setup_preprocessing(&$defaults){
 
-        if (!isset($defaults['popup'])) {
+        if (isset($defaults['options']) and $defaults['options'] === 'forcedownload') {
+            $defaults['forcedownload'] = 1;
+
+        } else if (!isset($defaults['popup'])) {
             // use form defaults
 
         } else if (!empty($defaults['popup'])) {