Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle

diff --git a/lib/xhprof/xhprof_moodle.php b/lib/xhprof/xhprof_moodle.php
index 9a4f850..c930d4f 100644 (file)
--- a/lib/xhprof/xhprof_moodle.php
+++ b/lib/xhprof/xhprof_moodle.php
@@ -613,6 +613,13 @@ function profiling_import_runs($file, $commentprefix = '') {
 function profiling_export_generate(array $runids, $tmpdir) {
     global $CFG, $DB;
 
+    if (empty($CFG->release) || empty($CFG->version)) {
+        // Some scripts may not have included version.php.
+        include($CFG->dirroot.'/version.php');
+        $CFG->release = $release;
+        $CFG->version = $version;
+    }
+
     // Calculate the header information to be sent to moodle_profiling_runs.xml.
     $release = $CFG->release;
     $version = $CFG->version;
@@ -865,7 +872,7 @@ class moodle_xhprofrun implements iXHProfRuns {
 
         $DB->insert_record('profiling', $rec);
 
-        if (PHPUNIT_TEST && !PHPUNIT_UTIL) {
+        if (PHPUNIT_TEST) {
             // Calculate export variables.
             $tempdir = 'profiling';
             make_temp_directory($tempdir);