Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle

diff --cc lib/form/filemanager.php
Simple merge

diff --cc lib/formslib.php
index 371c2b0,8ce3e87..4b541c4
--- 1/lib/formslib.php
--- 2/lib/formslib.php
+++ b/lib/formslib.php
@@@ -2252,10 -2249,9 +2249,10 @@@ class MoodleQuickForm_Renderer extends 
      /**
       * What to do when starting the form
       *
-      * @param object $form MoodleQuickForm
+      * @param MoodleQuickForm $form reference of the form
       */
      function startForm(&$form){
 +        global $PAGE;
          $this->_reqHTML = $form->getReqHTML();
          $this->_elementTemplates = str_replace('{req}', $this->_reqHTML, $this->_elementTemplates);
          $this->_advancedHTML = $form->getAdvancedHTML();