MDL-17458 moving lib/db/upgradelib.php to upgrade.php in order to maḱe it the the...

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index b4788b4ddfb69299bb61f5c29e44c7395ca643c7..775895cb4c866b359e4aec74181d77d7e2ee2868 100644 (file)
--- 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 518a86a22f84b1c152f9b8776bf09dcc55473b99..b0be5f44b1870c6da10b4b152760decd16833622 100644 (file)
--- 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