From 9c9fad9d7158afdc6a782b2e1b0f0e7be3bc3963 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Sat, 24 May 2008 23:14:42 +0000
Subject: [PATCH] Moving some old XMLDBxxx (deprecated) objects to the end of
 the file. Some PHP releases have problems finding new extended xmldb_xxxx
 objects if they haven't been defined before.

---
 lib/xmldb/xmldb_field.php     | 22 +++++++++++-----------
 lib/xmldb/xmldb_index.php     | 22 +++++++++++-----------
 lib/xmldb/xmldb_key.php       | 22 +++++++++++-----------
 lib/xmldb/xmldb_statement.php | 22 +++++++++++-----------
 lib/xmldb/xmldb_table.php     | 22 +++++++++++-----------
 5 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/lib/xmldb/xmldb_field.php b/lib/xmldb/xmldb_field.php
index 001f0e9a10..f235f8fb73 100644
--- a/lib/xmldb/xmldb_field.php
+++ b/lib/xmldb/xmldb_field.php
@@ -26,17 +26,6 @@
 
 /// This class represent one XMLDB Field
 
-/// TODO: Delete for 2.1 (deeprecated in 2.0).
-/// Deprecated API starts here
-class XMLDBField extends xmldb_field {
-
-    function __construct($name) {
-        parent::__construct($name);
-    }
-
-}
-/// Deprecated API ends here
-
 class xmldb_field extends xmldb_object {
 
     var $type;
@@ -932,4 +921,15 @@ class xmldb_field extends xmldb_object {
     }
 }
 
+/// TODO: Delete for 2.1 (deeprecated in 2.0).
+/// Deprecated API starts here
+class XMLDBField extends xmldb_field {
+
+    function __construct($name) {
+        parent::__construct($name);
+    }
+
+}
+/// Deprecated API ends here
+
 ?>
diff --git a/lib/xmldb/xmldb_index.php b/lib/xmldb/xmldb_index.php
index dcfb0aaee2..255aec4e39 100644
--- a/lib/xmldb/xmldb_index.php
+++ b/lib/xmldb/xmldb_index.php
@@ -26,17 +26,6 @@
 
 /// This class represent one XMLDB Index
 
-/// TODO: Delete for 2.1 (deeprecated in 2.0).
-/// Deprecated API starts here
-class XMLDBIndex extends xmldb_index {
-
-    function __construct($name) {
-        parent::__construct($name);
-    }
-
-}
-/// Deprecated API ends here
-
 class xmldb_index extends xmldb_object {
 
     var $unique;
@@ -283,4 +272,15 @@ class xmldb_index extends xmldb_object {
     }
 }
 
+/// TODO: Delete for 2.1 (deeprecated in 2.0).
+/// Deprecated API starts here
+class XMLDBIndex extends xmldb_index {
+
+    function __construct($name) {
+        parent::__construct($name);
+    }
+
+}
+/// Deprecated API ends here
+
 ?>
diff --git a/lib/xmldb/xmldb_key.php b/lib/xmldb/xmldb_key.php
index fb60c0c4db..04ac777cd4 100644
--- a/lib/xmldb/xmldb_key.php
+++ b/lib/xmldb/xmldb_key.php
@@ -26,17 +26,6 @@
 
 /// This class represent one XMLDB Key
 
-/// TODO: Delete for 2.1 (deeprecated in 2.0).
-/// Deprecated API starts here
-class XMLDBKey extends xmldb_key {
-
-    function __construct($name) {
-        parent::__construct($name);
-    }
-
-}
-/// Deprecated API ends here
-
 class xmldb_key extends xmldb_object {
 
     var $type;
@@ -477,4 +466,15 @@ class xmldb_key extends xmldb_object {
     }
 }
 
+/// TODO: Delete for 2.1 (deeprecated in 2.0).
+/// Deprecated API starts here
+class XMLDBKey extends xmldb_key {
+
+    function __construct($name) {
+        parent::__construct($name);
+    }
+
+}
+/// Deprecated API ends here
+
 ?>
diff --git a/lib/xmldb/xmldb_statement.php b/lib/xmldb/xmldb_statement.php
index 80587851bc..dea35a86e6 100644
--- a/lib/xmldb/xmldb_statement.php
+++ b/lib/xmldb/xmldb_statement.php
@@ -28,17 +28,6 @@
 /// (a group of SQL arbitrary sentences)
 /// (only INSERT is allowed for now)
 
-/// TODO: Delete for 2.1 (deeprecated in 2.0).
-/// Deprecated API starts here
-class XMLDBStatement extends xmldb_statement {
-
-    function __construct($name) {
-        parent::__construct($name);
-    }
-
-}
-/// Deprecated API ends here
-
 class xmldb_statement extends xmldb_object {
 
     var $table;     // Table we are handling
@@ -382,4 +371,15 @@ class xmldb_statement extends xmldb_object {
     }
 }
 
+/// TODO: Delete for 2.1 (deeprecated in 2.0).
+/// Deprecated API starts here
+class XMLDBStatement extends xmldb_statement {
+
+    function __construct($name) {
+        parent::__construct($name);
+    }
+
+}
+/// Deprecated API ends here
+
 ?>
diff --git a/lib/xmldb/xmldb_table.php b/lib/xmldb/xmldb_table.php
index d4fdfc2bcb..7f22e0fd2a 100644
--- a/lib/xmldb/xmldb_table.php
+++ b/lib/xmldb/xmldb_table.php
@@ -26,17 +26,6 @@
 
 /// This class represent one XMLDB table
 
-/// TODO: Delete for 2.1 (deeprecated in 2.0).
-/// Deprecated API starts here
-class XMLDBTable extends xmldb_table {
-
-    function __construct($name) {
-        parent::__construct($name);
-    }
-
-}
-/// Deprecated API ends here
-
 class xmldb_table extends xmldb_object {
 
     var $fields;
@@ -835,4 +824,15 @@ class xmldb_table extends xmldb_object {
     }
 }
 
+/// TODO: Delete for 2.1 (deeprecated in 2.0).
+/// Deprecated API starts here
+class XMLDBTable extends xmldb_table {
+
+    function __construct($name) {
+        parent::__construct($name);
+    }
+
+}
+/// Deprecated API ends here
+
 ?>
-- 
2.39.5