From 4f12838e3e523ae9be7f8eed6a2b16c22b13c2a7 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sun, 31 May 2009 17:38:18 +0000
Subject: [PATCH] =?utf8?q?MDL-17458=20moving=20lib/db/upgradelib.php=20to?=
 =?utf8?q?=20upgrade.php=20in=20order=20to=20ma=E1=B8=B1e=20it=20the=20the?=
 =?utf8?q?=20same=20for=20all=20plugins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/db/upgrade.php | 2 ++
 lib/upgradelib.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index b4788b4ddf..775895cb4c 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -22,6 +22,8 @@
 function xmldb_main_upgrade($oldversion) {
     global $CFG, $THEME, $USER, $DB;
 
+    require_once($CFG->libdir.'/db/upgradelib.php'); // Core Upgrade-related functions
+    
     $result = true;
 
     $dbman = $DB->get_manager(); // loads ddl manager and xmldb classes
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 518a86a22f..b0be5f44b1 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1060,7 +1060,6 @@ function upgrade_core($version, $verbose) {
     global $CFG;
 
     require_once($CFG->libdir.'/db/upgrade.php');    // Defines upgrades
-    require_once($CFG->libdir.'/db/upgradelib.php'); // Core Upgrade-related functions
 
     try {
         // Upgrade current language pack if we can
-- 
2.39.5