From ebf20af07d31557df67b40da3238669f78958f9f Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 30 Aug 2008 18:48:39 +0000
Subject: [PATCH] MDL-15635 dml library inclusion refactoring

---
 lib/ddl/database_manager.php | 1 +
 lib/dml/moodle_database.php  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ddl/database_manager.php b/lib/ddl/database_manager.php
index f95a240b95..2192bcddda 100644
--- a/lib/ddl/database_manager.php
+++ b/lib/ddl/database_manager.php
@@ -914,6 +914,7 @@ if (!is_object($xmldb_key)) {
      */
     public function get_install_xml_schema() {
         global $CFG;
+        require_once($CFG->libdir.'/adminlib.php');
 
         $schema = new xmldb_structure('export');
         $schema->setVersion($CFG->version);
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index b37ef39361..470d082743 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -471,8 +471,7 @@ abstract class moodle_database {
         global $CFG;
 
         if (!$this->database_manager) {
-            require_once($CFG->libdir.'/adminlib.php');
-            require_once($CFG->libdir.'/ddl/database_manager.php');
+            require_once($CFG->libdir.'/ddllib.php');
 
             $classname = $this->get_dbfamily().'_sql_generator';
             require_once("$CFG->libdir/ddl/$classname.php");
-- 
2.39.5