From 4f6be42cdee57f011493e8d1e4bd2c711f2f675c Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Tue, 18 May 2010 11:58:53 +0000
Subject: [PATCH] MDL-22061 Fixed regression, non-translated exception names do
 not produce debugging

---
 lib/setuplib.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/setuplib.php b/lib/setuplib.php
index 84255ae22f9..8aba8d23459 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -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;