From c1f7441a054258d816257cd5515f4d3f96ea0477 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 16 May 2007 21:29:12 +0000
Subject: [PATCH] MDL-9392 resource_popup: not working; merged from
 MOODLE_18_STABLE

---
 mod/resource/type/file/resource.class.php       | 6 +++++-
 mod/resource/type/html/resource.class.php       | 6 +++++-
 mod/resource/type/ims/resource.class.php        | 6 +++++-
 mod/resource/type/repository/resource.class.php | 6 +++++-
 mod/resource/type/text/resource.class.php       | 6 +++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index a035ea699d4c6..8a27739b19005 100644
--- 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 c41e7b5b325c5..22678843c7875 100644
--- 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 d063cd740c6db..70cbff38c2a39 100644
--- 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
index 5b6de91b6bf04..18bc1d3325a05 100644
--- 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 6c2af43e79d9e..426d10436444c 100644
--- 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']);