From: moodler <moodler>
Date: Tue, 24 Aug 2004 04:58:06 +0000 (+0000)
Subject: Merged changes from 14 STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e69ef14bf2b8ae71d0281d6c5d352bde3b966fc7;p=moodle.git

Merged changes from 14 STABLE
---

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 5800820e3d..196a01b138 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2,7 +2,7 @@
        // Contains functions that only administrators will ever need to use
 
 function upgrade_enrol_plugins($return) {
-    global $CFG;
+    global $CFG, $db;
 
     if (!$mods = get_list_of_plugins("enrol") ) {
         error("No modules installed!");
@@ -87,7 +87,7 @@ function upgrade_enrol_plugins($return) {
 function upgrade_activity_modules($return) {
 /// Find and check all modules and load them up or upgrade them if necessary
 
-    global $CFG;
+    global $CFG, $db;
 
     if (!$mods = get_list_of_plugins("mod") ) {
         error("No modules installed!");