MDL-9392 resource_popup: not working; merged from MOODLE_18_STABLE

moodle · May 16, 2007 · c1f7441 · c1f7441
1 parent ec74e82
commit c1f7441
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
@@ -586,7 +586,11 @@ function set_encrypted_parameter() {
 }
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
@@ -133,7 +133,11 @@ function display() {
 }
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
@@ -608,7 +608,11 @@ function print_nav($items, $resource, $page) {
 
 
     function setup_preprocessing(&$defaults){
-        if (!empty($defaults['popup'])) {
+
+        if (!isset($defaults['popup'])) {
+            // use form defaults
+
+        } else if (!empty($defaults['popup'])) {
             $defaults['windowpopup'] = 1;
             if (array_key_exists('popup', $defaults)) {
                 $rawoptions = explode(',', $defaults['popup']);

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
@@ -512,7 +512,11 @@ function set_encrypted_parameter() {
 
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
@@ -132,7 +132,11 @@ function display() {
 
 
 function setup_preprocessing(&$defaults){
-    if (!empty($defaults['popup'])) {
+
+    if (!isset($defaults['popup'])) {
+        // use form defaults
+
+    } else if (!empty($defaults['popup'])) {
         $defaults['windowpopup'] = 1;
         if (array_key_exists('popup', $defaults)) {
             $rawoptions = explode(',', $defaults['popup']);