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.

diff --git a/lib/xmldb/xmldb_field.php b/lib/xmldb/xmldb_field.php
index 001f0e9a1014e844a30d69201450b294c6be4678..f235f8fb734db204c4c5e3f54753a7102215b3ee 100644 (file)
--- 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 dcfb0aaee23ab1490a4e9bd7a8c0598db70020b5..255aec4e39422456d17069b10a1ac76591388943 100644 (file)
--- 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 fb60c0c4db0c6f1804c1af8e7048b7dd6a6652ea..04ac777cd49c9e46f11e90e1b94959e19179890d 100644 (file)
--- 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 80587851bc3f5c81c59068f15676045d1a20597b..dea35a86e6b8a3e2c30dbf90b080b3f953a28375 100644 (file)
--- 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 d4fdfc2bcbeb44450c3204d97c68e57b0bedf403..7f22e0fd2a3559ea064e87190d417499f3d57145 100644 (file)
--- 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
+
 ?>