Merge branch 'm39_MDL-68536_Notice_Undefined_Property_CFG_branch' of https://github.com/scara/moodle into MOODLE_39_STABLE

2020-10-21 18:33:15 +02:00
parent 6178388d94 d84da184c5
commit 41cd0c4d3a
1 changed files with 1 additions and 1 deletions
@@ -752,7 +752,7 @@ class core_plugin_manager {
    public function all_plugins_ok($moodleversion, &$failedplugins = array(), $branch = null) {
        global $CFG;
        if (empty($branch)) {
-            $branch = $CFG->branch;
+            $branch = $CFG->branch ?? '';
            if (empty($branch)) {
                // During initial install there is no branch set.
                require($CFG->dirroot . '/version.php');