"MDL-19077, pixpath is broken, use initialise_deprecated_cfg_pixpath() as a temporary...

diff --git a/lib/formslib.php b/lib/formslib.php
index a946d8a3776e622257a8c529c95779df5d593aaf..92e0abbd98bcbcbd92d3cea18b369ffcec900db2 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1062,7 +1062,8 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
      * @access   public
      */
     function MoodleQuickForm($formName, $method, $action, $target='', $attributes=null){
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         static $formcounter = 1;
 

diff --git a/lib/weblib.php b/lib/weblib.php
index 38555dbc1e3001a1360860b5a57fcf9bd7f176b0..16886e86c1f8a1f74d3dc828c0680d928ed69f71 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -5468,7 +5468,8 @@ function editorhelpbutton(){
  */
 function helpbutton($page, $title, $module='moodle', $image=true, $linktext=false, $text='', $return=false,
                      $imagetext='') {
-    global $CFG, $COURSE;
+    global $CFG, $COURSE, $OUTPUT;
+    $OUTPUT->initialise_deprecated_cfg_pixpath();
 
     //warning if ever $text parameter is used
     //$text option won't work properly because the text needs to be always cleaned and,