From e6d8bc8c4a7789d419c0ac608b369e7d1775a16b Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 16 Jan 2008 01:51:18 +0000 Subject: [PATCH] Merged upgradelib.php fixes from 1.9 MDL-13017 --- admin/index.php | 1 + lib/db/upgrade.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/admin/index.php b/admin/index.php index 370c586dc3..ea1b426367 100644 --- a/admin/index.php +++ b/admin/index.php @@ -24,6 +24,7 @@ require_once('../config.php'); require_once($CFG->libdir.'/adminlib.php'); // Contains various admin-only functions require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions + require_once($CFG->libdir.'/db/upgradelib.php'); // Upgrade-related functions $id = optional_param('id', '', PARAM_TEXT); $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL); diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 9ff44a8f54..260c9980ea 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -1344,7 +1344,6 @@ function xmldb_main_upgrade($oldversion=0) { /// upgrade the old 1.8 gradebook - migrade data into new grade tables if ($result) { - require_once($CFG->libdir.'/db/upgradelib.php'); if ($rs = get_recordset('course')) { while ($course = rs_fetch_next_record($rs)) { // this function uses SQL only, it must not be changed after 1.9 goes stable!! @@ -1648,7 +1647,6 @@ function xmldb_main_upgrade($oldversion=0) { } if ($result && $oldversion < 2007081302) { - require_once($CFG->libdir.'/db/upgradelib.php'); if (table_exists(new XMLDBTable('groups_groupings'))) { /// IF 'groups_groupings' table exists, this is for 1.8.* only. @@ -2278,7 +2276,6 @@ function xmldb_main_upgrade($oldversion=0) { /// migrade grade letters - we can not do this in normal grades upgrade becuase we need all course contexts if ($result && $oldversion < 2007092806) { - require_once($CFG->libdir.'/db/upgradelib.php'); $result = upgrade_18_letters(); -- 2.39.5