MDL-10433 Upgrade: undo_groupings() causes warnings (before groupings exist)

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 03ac6e558095dd13aba65a029504dcaf852cf779..635b78fe98b93e653f66a209105badba3b291333 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -854,7 +854,7 @@ function xmldb_main_upgrade($oldversion=0) {
     }
 
     if ($result && $oldversion < 2007051101) {
-        if (empty($CFG->enablegroupings)) {
+        if (empty($CFG->enablegroupings) and !empty($CFG->group_version)) {
             // delete all groupings - they do not work yet :-(
             // while keeping all existing groups
             require_once("$CFG->dirroot/group/db/upgrade.php");