Merged print_error fix from stable

diff --git a/lib/weblib.php b/lib/weblib.php
index 0459d110fcdcafe8ad54d66329e747ad3985b2dd..6dadc56f5039869e55d2ccbf20bd530ab9c917e6 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4089,8 +4089,9 @@ function error ($message, $link='') {
  * @uses $CFG
  * @param string $errorcode The name of the string from error.php to print
  * @param string $link The url where the user will be prompted to continue. If no url is provided the user will be directed to the site index page.
+ * @param object $a Extra words and phrases that might be required in the error string
  */
-function print_error ($errorcode, $module='', $link='') {
+function print_error ($errorcode, $module='', $link='', $a=NULL) {
 
     global $CFG;
 
@@ -4109,7 +4110,7 @@ function print_error ($errorcode, $module='', $link='') {
         $errordocroot = 'http://docs.moodle.org';
     }
 
-    $message = '<p class="errormessage">'.get_string($errorcode, $module).'</p>'.
+    $message = '<p class="errormessage">'.get_string($errorcode, $module, $a).'</p>'.
                '<p class="errorcode">'.
                '<a href="'.$errordocroot.'/en/error/'.$modulelink.'/'.$errorcode.'">'.
                  get_string('moreinformation').'</a></p>';