From: moodler Date: Wed, 14 Jun 2006 03:17:19 +0000 (+0000) Subject: Merged print_error fix from stable X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=05b7eba955678c0bc78c7106148e9dccbfb28484;p=moodle.git Merged print_error fix from stable --- diff --git a/lib/weblib.php b/lib/weblib.php index 0459d110fc..6dadc56f50 100644 --- 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 = '

'.get_string($errorcode, $module).'

'. + $message = '

'.get_string($errorcode, $module, $a).'

'. '

'. ''. get_string('moreinformation').'

';