MDL-19799 Migrated calls to close_window_button()

diff --git a/help.php b/help.php
index 655c8f54bfabb3b27e5044e6bcd9f5a51c16f31d..221823e764af70feaf4e3edc948d6c68ec6d7be8 100644 (file)
--- a/help.php
+++ b/help.php
@@ -107,7 +107,7 @@ if (!$helpfound) {
 }
 
 // End of page.
-close_window_button();
+echo $OUTPUT->close_window_button();
 echo '<p class="helpindex"><a href="help.php?file=index.html">'. get_string('helpindex') .'</a></p>';
 
 // Offer a link to the alternative help file language

diff --git a/lib/form/editorhelp.php b/lib/form/editorhelp.php
index b2b0df5347bab492eea43010c04ffafc151e7d25..a8fa02e141b3a184beb5eaf624ccdeb292011bcc 100644 (file)
--- a/lib/form/editorhelp.php
+++ b/lib/form/editorhelp.php
@@ -66,7 +66,7 @@ foreach ($topics as $i => $topic){
 echo '</ul>';
 print_simple_box_end();
 // End of page.
-close_window_button();
+echo $OUTPUT->close_window_button();
 global $CFG;
 echo '<p align="center"><a href="'.$CFG->wwwroot.'/help.php?file=index.html">'. get_string('helpindex') .'</a></p>';
 

diff --git a/lib/installlib.php b/lib/installlib.php
index 7187bf02e1325c98e0df4cb343e4876c9386edff..c36bb51acb96840f17b017bac010b2a6ef942eec 100644 (file)
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -218,7 +218,7 @@ function install_generate_configphp($database, $cfg, $userealpath=false) {
  * @param string $help
  */
 function install_print_help_page($help) {
-    global $CFG;
+    global $CFG, $OUTPUT;
 
     @header('Content-Type: text/html; charset=UTF-8');
     @header('Cache-Control: no-store, no-cache, must-revalidate');
@@ -248,7 +248,7 @@ function install_print_help_page($help) {
         default:
             print_string($help, 'install');
     }
-    close_window_button();
+    echo $OUTPUT->close_window_button();
     echo '</body></html>';
     die;
 }

diff --git a/sso/hive/expired.php b/sso/hive/expired.php
index ef0d9b3145dfa580e585d91d737423427d9a1a9d..e67dc9d6a383bc77928b7ff3a2bc2aef1de8a01e 100644 (file)
--- a/sso/hive/expired.php
+++ b/sso/hive/expired.php
@@ -43,5 +43,5 @@
       </form>
 <br />
 <?php
-    close_window_button();
+    echo $OUTPUT->close_window_button();
 ?>