From: moodler <moodler>
Date: Fri, 9 Jan 2004 07:16:07 +0000 (+0000)
Subject: Old settings weren't being remembered - fixed now.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0643b1db7a04c9ab12de93c254ee3bbe00363dd9;p=moodle.git

Old settings weren't being remembered - fixed now.
---

diff --git a/mod/resource/details.php b/mod/resource/details.php
index 31088a20e4..cd3c717310 100644
--- a/mod/resource/details.php
+++ b/mod/resource/details.php
@@ -116,8 +116,7 @@
                 foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
                     $stringname = "str$optionname";
                     $$stringname = get_string("new$optionname", "resource");
-                    $defaultvalue = "resource_popup$optionname";
-                    $window->$optionname = $CFG->$defaultvalue;
+                    $window->$optionname = "";
                     $jsoption[] = "\"$optionname\"";
                 }
                 $alljsoptions = implode(",", $jsoption);
@@ -140,6 +139,10 @@
                         }
                     }
                 } else {
+                    foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
+                        $defaultvalue = "resource_popup$optionname";
+                        $window->$optionname = $CFG->$defaultvalue;
+                    }
                     $newwindow = $CFG->resource_popup;
                 }
 
@@ -225,8 +228,7 @@
                 foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
                     $stringname = "str$optionname";
                     $$stringname = get_string("new$optionname", "resource");
-                    $defaultvalue = "resource_popup$optionname";
-                    $window->$optionname = $CFG->$defaultvalue;
+                    $window->$optionname = "";
                     $jsoption[] = "\"$optionname\"";
                 }
                 $alljsoptions = implode(",", $jsoption);
@@ -249,6 +251,10 @@
                         }
                     }
                 } else {
+                    foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
+                        $defaultvalue = "resource_popup$optionname";
+                        $window->$optionname = $CFG->$defaultvalue;
+                    }
                     $newwindow = $CFG->resource_popup;
                 }