MDL-9392 resource_popup: not working; merged from MOODLE_18_STABLE

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index a035ea699d4c65d019b7745f7b2fa6d69ed2109d..8a27739b1900540a906a0ad43ffd2aed7227bdff 100644 (file)
--- 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
index c41e7b5b325c597ef76f5f1de1e75beba086834c..22678843c7875de50a6b98c5d7d0c6b09a1bd798 100644 (file)
--- 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
index d063cd740c6dbbe95ee704a88a3f863465c65b5c..70cbff38c2a3907e724d29094c42772cbe331a70 100644 (file)
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -608,7 +608,11 @@ class resource_ims extends resource_base {
 
 
     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
index 5b6de91b6bf046e27b5efffed78449e1a5b23f74..18bc1d3325a05415b6b54f728ba0c42881dfd4a0 100644 (file)
--- 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
index 6c2af43e79d9ee598dd3d842faa3b381da3400c1..426d10436444ca37c3fd6c4df558640d44fd57e2 100644 (file)
--- 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']);