L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22061 Fixed regression, non-translated exception names do not produce debugging

Browse Source
This commit is contained in:
David Mudrak
2010-05-18 11:58:53 +00:00
parent 89259d0c14
commit 4f6be42cde
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/setuplib.php
+11 -4
View File
@@ -85,7 +85,11 @@ class moodle_exception extends Exception {
$this->a = $a;
$this->debuginfo = $debuginfo;
$message = get_string($errorcode, $module, $a);
if (get_string_manager()->string_exists($errorcode, $module)) {
$message = get_string($errorcode, $module, $a);
} else {
$message = $module . '/' . $errorcode;
}
parent::__construct($message, 0);
}
@@ -336,11 +340,14 @@ function get_exception_info($ex) {
if (empty($module) || $module == 'moodle' || $module == 'core') {
$module = 'error';
}
if (function_exists('get_string')) {
$message = get_string($errorcode, $module, $a);
if ($module === 'error' and strpos($message, '[[') === 0) {
if (function_exists('get_string_manager')) {
if (get_string_manager()->string_exists($errorcode, $module)) {
$message = get_string($errorcode, $module, $a);
} elseif ($module == 'error' && get_string_manager()->string_exists($errorcode, 'moodle')) {
// Search in moodle file if error specified - needed for backwards compatibility
$message = get_string($errorcode, 'moodle', $a);
} else {
$message = $module . '/' . $errorcode;
}
} else {
$message = $module . '/' . $errorcode;