MDL-19756 Fixed typo in debugging messages and added default string for close_window_...

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index f7f44e465e2ba38f078736b18ddfdc838788c1b3..0d96eecc6cbeeb75bbeaa9aef5c52d01e3b1cbaa 100644 (file)
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3528,7 +3528,7 @@ function update_module_button($cmid, $ignored, $string) {
  * @deprecated since Moodle 2.0
  */
 function update_categories_search_button($search,$page,$perpage) {
-    throw new coding_exception('update_tag_button() has been completely deprecated.');
+    throw new coding_exception('update_categories_search_button() has been completely deprecated.');
 }
 
 /**

diff --git a/lib/outputlib.php b/lib/outputlib.php
index a9d29b16808cd32875cf13e293c972d05fb1463c..f8a42c820221fa2376ddbef36c2414384dc6610b 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -2892,6 +2892,9 @@ class moodle_core_renderer extends moodle_renderer_base {
      * @return string|void if $return is true, void otherwise
      */
     public function close_window_button($text) {
+        if (empty($text)) {
+            $text = get_string('closewindow');
+        }
         $closeform = new html_form();
         $closeform->url = '#';
         $closeform->button->text = $text;