MDL-68588 Backup: Hide ->backuptempdir in exception info

diff --git a/lib/setuplib.php b/lib/setuplib.php
index 4aa3b9a..2131587 100644 (file)
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -551,7 +551,7 @@ function get_exception_info($ex) {
     // Remove some absolute paths from message and debugging info.
     $searches = array();
     $replaces = array();
-    $cfgnames = array('tempdir', 'cachedir', 'localcachedir', 'themedir', 'dataroot', 'dirroot');
+    $cfgnames = array('backuptempdir', 'tempdir', 'cachedir', 'localcachedir', 'themedir', 'dataroot', 'dirroot');
     foreach ($cfgnames as $cfgname) {
         if (property_exists($CFG, $cfgname)) {
             $searches[] = $CFG->$cfgname;

diff --git a/lib/tests/setuplib_test.php b/lib/tests/setuplib_test.php
index 6e3ce5b..1e6c3b3 100644 (file)
--- a/lib/tests/setuplib_test.php
+++ b/lib/tests/setuplib_test.php
@@ -79,7 +79,7 @@ class core_setuplib_testcase extends advanced_testcase {
         global $CFG;
 
         // This doesn't test them all possible ones, but these are set for unit tests.
-        $cfgnames = array('dataroot', 'dirroot', 'tempdir', 'cachedir', 'localcachedir');
+        $cfgnames = array('dataroot', 'dirroot', 'tempdir', 'backuptempdir', 'cachedir', 'localcachedir');
 
         $fixture  = '';
         $expected = '';