MDL-19814 Migrated calls to close_window_button()

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 3493c8277209d317526b2e12a6bb2dbea0a2af3b..2dfc3523b6806c06b6ddb6d01cbd3dfd63193a66 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -344,7 +344,7 @@ class resource_file extends resource_base {
             }
             notify(get_string('notallowedlocalfileaccess', 'resource', ''));
             if ($inpopup) {
-                close_window_button();
+                echo $OUTPUT->close_window_button();
             }
             print_footer('none');
             die;

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 748eb8486525c951664e23e981983426d0b71dc6..957777e8467e534ffc3fd4b76d9a69d0078e9a9a 100644 (file)
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -315,7 +315,7 @@ class resource_ims extends resource_base {
      * @param    CFG     global object
      */
     function display() {
-        global $CFG, $THEME, $USER, $PAGE;
+        global $CFG, $THEME, $USER, $PAGE, $OUTPUT;
 
         require_once($CFG->libdir.'/filelib.php');
 
@@ -397,7 +397,7 @@ class resource_ims extends resource_base {
             print_simple_box_end();
         /// Close button if inpopup
             if ($inpopup) {
-                close_window_button();
+                echo $OUTPUT->close_window_button();
             }
 
             print_footer();

diff --git a/mod/resource/type/repository/hive/openhive.php b/mod/resource/type/repository/hive/openhive.php
index 10f40c48cb7f8cd6f911e77977cb210edf89716e..942d7a0236bd2907bbe4ab4d4fc3f08a2281f6cb 100644 (file)
--- a/mod/resource/type/repository/hive/openhive.php
+++ b/mod/resource/type/repository/hive/openhive.php
@@ -12,7 +12,7 @@
     if (empty($SESSION->HIVE_SESSION)) {
         print_header();
         notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.');
-        close_window_button();
+        echo $OUTPUT->close_window_button();
         print_footer();
         die;
     }

diff --git a/mod/resource/type/repository/hive/openlitebrowse.php b/mod/resource/type/repository/hive/openlitebrowse.php
index 9eae44846081e2856385a1d6a1a7251cabaef1b4..35fd13b8ff3a15826b53dba93704e4233a111528 100644 (file)
--- a/mod/resource/type/repository/hive/openlitebrowse.php
+++ b/mod/resource/type/repository/hive/openlitebrowse.php
@@ -12,7 +12,7 @@
     if (empty($SESSION->HIVE_SESSION)) {
         print_header();
         notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.');
-        close_window_button();
+        echo $OUTPUT->close_window_button();
         print_footer();
         die;
     }

diff --git a/mod/resource/type/repository/hive/openlitepublish.php b/mod/resource/type/repository/hive/openlitepublish.php
index d0fef9fab89028d2599593992df8ba804c2ef638..c905341194c5188f4172967d286a21bc8eb3a629 100644 (file)
--- a/mod/resource/type/repository/hive/openlitepublish.php
+++ b/mod/resource/type/repository/hive/openlitepublish.php
@@ -12,7 +12,7 @@
     if (empty($SESSION->HIVE_SESSION)) {
         print_header();
         notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.');
-        close_window_button();
+        echo $OUTPUT->close_window_button();
         print_footer();
         die;
     }

diff --git a/mod/resource/type/repository/hive/openlitesearch.php b/mod/resource/type/repository/hive/openlitesearch.php
index 20ac598de2e3cfd697828f56340b922a791a3d93..f35f86330232eb7824ce028581bbdb82b8e68a9a 100644 (file)
--- a/mod/resource/type/repository/hive/openlitesearch.php
+++ b/mod/resource/type/repository/hive/openlitesearch.php
@@ -12,7 +12,7 @@
     if (empty($SESSION->HIVE_SESSION)) {
         print_header();
         notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.');
-        close_window_button();
+        echo $OUTPUT->close_window_button();
         print_footer();
         die;
     }

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 716b57478af75c08b57e0a0fc5069571219c8e40..a115ec5b5f9fd04ac488b269abb731738e288861 100644 (file)
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -181,7 +181,7 @@ function _postprocess(&$resource) {
 * @param    CFG     global object
 */
 function display() {
-    global $CFG, $THEME, $SESSION;
+    global $CFG, $THEME, $SESSION, $OUTPUT;
 
 /// Set up generic stuff first, including checking for access
     parent::display();
@@ -271,7 +271,7 @@ function display() {
         }
         notify('You do not have access to HarvestRoad Hive. This resource is unavailable.');
         if ($inpopup) {
-            close_window_button();
+            echo $OUTPUT->close_window_button();
         }
         print_footer('none');
         die;
@@ -290,7 +290,7 @@ function display() {
         }
         notify(get_string('notallowedlocalfileaccess', 'resource', ''));
         if ($inpopup) {
-            close_window_button();
+            echo $OUTPUT->close_window_button();
         }
         print_footer('none');
         die;