MDL-19814 Migrated calls to close_window_button()

NoelDeMartin · Aug 6, 2009 · e087ee7 · e087ee7
1 parent d36cb95
commit e087ee7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
@@ -344,7 +344,7 @@ function display() {
             }
             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
@@ -315,7 +315,7 @@ function delete_instance($resource) {
      * @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 @@ function display() {
             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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;