Merged print_error fix from stable

This commit is contained in:
moodler
2006-06-14 03:17:19 +00:00
parent a503a59068
commit 05b7eba955
+3 -2
View File
@@ -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>';