From: skodak <skodak>
Date: Thu, 12 Jul 2007 15:31:49 +0000 (+0000)
Subject: MDL-10433 Upgrade: undo_groupings() causes warnings (before groupings exist)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=68d2023487f6403754b75955555d979e14b74eec;p=moodle.git

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

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 03ac6e5580..635b78fe98 100644
--- 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");