formslib MDL-19626 Changed JS string handling to new $PAGE methods, Thanks Dan

diff --git a/lib/formslib.php b/lib/formslib.php
index e3b9aa13956d223bdb4611683ae6bcd86c562cc2..a946d8a3776e622257a8c529c95779df5d593aaf 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2153,9 +2153,9 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
             $button_nojs = '<input name="'.$elementName.'" id="'.$elementName.(string)$advformcount.'" class="showadvancedbtn" value="'.$buttonlabel.'" type="submit" />';
 
             $buttonlabel = addslashes_js($buttonlabel);
-            $showtext = addslashes_js(get_string('showadvanced', 'form'));
-            $hidetext = addslashes_js(get_string('hideadvanced', 'form'));
-            $PAGE->requires->js_function_call('showAdvancedInit', Array($elementName.(string)$advformcount, $elementName, $buttonlabel, $hidetext, $showtext));
+            $PAGE->requires->string_for_js('showadvanced', 'form');
+            $PAGE->requires->string_for_js('hideadvanced', 'form');
+            $PAGE->requires->js_function_call('showAdvancedInit', Array($elementName.(string)$advformcount, $elementName, $buttonlabel));
             
             $advformcount++;
             $header_html = str_replace('{button}', $button_nojs, $header_html);

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index e87779d09deee84fbbfb69e0be4783d45ccd8fe7..0a9b89aaa22f78f5a28db43dd05fa816d1b9a3bc 100644 (file)
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -342,8 +342,8 @@ function showAdvancedInit(addBefore, nameAttr, buttonLabel, hideText, showText)
     showHideButton.value = buttonLabel;
     showHideButton.name = nameAttr;
     showHideButton.moodle = {
-        hideLabel: hideText,
-        showLabel: showText
+        hideLabel: mstr.form.hideadvanced,
+        showLabel: mstr.form.showadvanced
     };
     YAHOO.util.Event.addListener(showHideButton, 'click', showAdvancedOnClick);
     el = document.getElementById(addBefore);