mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-28599 textlib Capture error message earlier to avoid mixing

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-09-06 13:45:25 +02:00
parent 0fde6cb8b4
commit 20079ee7bc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/textlib.class.php
View File

@ -595,6 +595,7 @@ abstract class collatorlib {
// after instantiation as any futher calls to collation will cause
// it to reset to 0 again (or another error code if one occured)
$errorcode = $collator->getErrorCode();
$errormessage = $collator->getErrorMessage();
// Check for an error code, 0 means no error occured
if ($errorcode !== 0) {
// Get the actual locale being used, e.g. en, he, zh
@ -617,7 +618,7 @@ abstract class collatorlib {
} else {
// We've recieved some other sort of non fatal warning - let the
// user know about it via debugging.
debugging('Locale collator generated warnings (not fatal) "'.$collator->getErrorMessage().'" falling back to '.$collator->getLocale(Locale::VALID_LOCALE));
debugging('Locale collator generated warnings (not fatal) "'.$errormessage.'" falling back to '.$collator->getLocale(Locale::VALID_LOCALE));
}
}
// Store the collator object now that we can be sure it is in a workable condition.
@ -789,4 +790,4 @@ class collatorlib_method_comparison extends collatorlib_comparison {
$resultb = $objb->{$this->method}();
return collatorlib::compare($resulta, $resultb);
}
}
}