### Eclipse Workspace Patch 1.0
#P moodle19
Index: mod/resource/type/file/resource.class.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/resource/type/file/resource.class.php,v
retrieving revision 1.71.2.9
diff -u -r1.71.2.9 resource.class.php
--- mod/resource/type/file/resource.class.php	26 Mar 2008 02:46:48 -0000	1.71.2.9
+++ mod/resource/type/file/resource.class.php	1 Apr 2008 08:14:24 -0000
@@ -132,7 +132,10 @@
         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;
@@ -163,10 +166,6 @@
             unset($resource->$parametername);
         }
 
-        if ($resource->forcedownload) {
-            $resource->options = 'forcedownload';
-        }
-
         $resource->alltext = implode(',', $optionlist);
     }
 
@@ -665,7 +664,10 @@
 
     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'])) {