Merge branch 'wip-MSFTMPP-426-m30' into MOODLE_30_STABLE

microsoft · Mar 29, 2016 · e055bb1 · e055bb1
2 parents d1ab337 + ea150f8
commit e055bb1
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/classes/utils.php b/classes/utils.php
@@ -90,6 +90,18 @@ public static function tostring($val) {
             }
         } else if (is_null($val)) {
             return '(null)';
+        } else if ($val instanceof \Exception) {
+            $valinfo = [
+                'file' => $val->getFile(),
+                'line' => $val->getLine(),
+                'message' => $val->getMessage(),
+            ];
+            if ($val instanceof \moodle_exception) {
+                $valinfo['debuginfo'] = $val->debuginfo;
+                $valinfo['errorcode'] = $val->errorcode;
+                $valinfo['module'] = $val->module;
+            }
+            return print_r($valinfo, true);
         } else {
             return print_r($val, true);
         }