From 598b38f7435ef706a387e8cd9f75b4fc0e83dc5e Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 30 Aug 2008 18:47:22 +0000
Subject: [PATCH] MDL-15635 library inclusion refactoring

---
 lib/adminlib.php | 18 +++---------------
 lib/ddllib.php   | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index e2b2a6a381..15008f76d9 100644
--- 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 28039cbe0c..5fad1d1ea3 100644
--- 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');
 
-?>
-- 
2.39.5