MDL-15635 library inclusion refactoring

diff --git a/lib/adminlib.php b/lib/adminlib.php
index e2b2a6a381139cd3eb9b629aab1fea57bdc708ea..15008f76d9e72fcbb7cea41bc821bcd626852cc7 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -9,22 +9,10 @@
  * @package moodlecore
  */
 
-/// Add required XMLDB constants
-require_once($CFG->libdir.'/xmldb/xmldb_constants.php');
-
-/// Add required XMLDB DB classes
-require_once($CFG->libdir.'/xmldb/xmldb_object.php');
-require_once($CFG->libdir.'/xmldb/xmldb_file.php');
-require_once($CFG->libdir.'/xmldb/xmldb_structure.php');
-require_once($CFG->libdir.'/xmldb/xmldb_table.php');
-require_once($CFG->libdir.'/xmldb/xmldb_field.php');
-require_once($CFG->libdir.'/xmldb/xmldb_key.php');
-require_once($CFG->libdir.'/xmldb/xmldb_index.php');
-require_once($CFG->libdir.'/xmldb/xmldb_statement.php');
-
-/// Add other libraries
+/// Add libraries
+require_once($CFG->libdir.'/ddllib.php');
 require_once($CFG->libdir.'/xmlize.php');
-require_once($CFG->libdir .'/messagelib.php');      // Messagelib functions
+require_once($CFG->libdir.'/messagelib.php');      // Messagelib functions
 
 global $upgradeloghandle, $upgradelogbuffer;
 

diff --git a/lib/ddllib.php b/lib/ddllib.php
index 28039cbe0c5571d3b0838098ba4d9dc9c5ae1d02..5fad1d1ea3e8fcc0e9f9679a6f24928234e8dcb9 100644 (file)
--- a/lib/ddllib.php
+++ b/lib/ddllib.php
@@ -38,7 +38,19 @@
 //
 // For further documentation, visit http://docs.moodle.org/en/DDL_functions
 
-// DEPRECATED - to be removed soon
+/// Add required XMLDB constants
+require_once($CFG->libdir.'/xmldb/xmldb_constants.php');
 
+/// Add required XMLDB DB classes
+require_once($CFG->libdir.'/xmldb/xmldb_object.php');
+require_once($CFG->libdir.'/xmldb/xmldb_file.php');
+require_once($CFG->libdir.'/xmldb/xmldb_structure.php');
+require_once($CFG->libdir.'/xmldb/xmldb_table.php');
+require_once($CFG->libdir.'/xmldb/xmldb_field.php');
+require_once($CFG->libdir.'/xmldb/xmldb_key.php');
+require_once($CFG->libdir.'/xmldb/xmldb_index.php');
+require_once($CFG->libdir.'/xmldb/xmldb_statement.php');
+
+require_once($CFG->libdir.'/ddl/sql_generator.php');
+require_once($CFG->libdir.'/ddl/database_manager.php');
 
-?>