MDL-15635 dml library inclusion refactoring

diff --git a/lib/ddl/database_manager.php b/lib/ddl/database_manager.php
index f95a240b95bbb5ed7b58c6a8745c88367eef5cd7..2192bcddda875c745a5f158872ec5d6fd1f8caa8 100644 (file)
--- 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 b37ef39361ff45b4745e46cc2d7919220231d8d4..470d082743fd206bf84e9068504a32b75cb784c6 100644 (file)
--- 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");