MDL-32003 fix broken table ordering and cleanup other xmldb ordering

anovikov · Jun 17, 2012 · 2edc3fe · 2edc3fe
1 parent aaddfac
commit 2edc3fe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/admin/tool/xmldb/actions/move_updown_field/move_updown_field.class.php b/admin/tool/xmldb/actions/move_updown_field/move_updown_field.class.php
@@ -122,7 +122,7 @@ function invoke() {
         $table->setChanged(true);
 
         // Reorder the fields
-        $table->orderFields($fields);
+        $table->orderFields();
 
         // Recalculate the hash
         $structure->calculateHash(true);

diff --git a/admin/tool/xmldb/actions/move_updown_index/move_updown_index.class.php b/admin/tool/xmldb/actions/move_updown_index/move_updown_index.class.php
@@ -122,7 +122,7 @@ function invoke() {
         $table->setChanged(true);
 
         // Reorder the indexes
-        $table->orderIndexes($indexes);
+        $table->orderIndexes();
 
         // Recalculate the hash
         $structure->calculateHash(true);

diff --git a/admin/tool/xmldb/actions/move_updown_key/move_updown_key.class.php b/admin/tool/xmldb/actions/move_updown_key/move_updown_key.class.php
@@ -122,7 +122,7 @@ function invoke() {
         $table->setChanged(true);
 
         // Reorder the keys
-        $table->orderKeys($keys);
+        $table->orderKeys();
 
         // Recalculate the hash
         $structure->calculateHash(true);

diff --git a/admin/tool/xmldb/actions/move_updown_table/move_updown_table.class.php b/admin/tool/xmldb/actions/move_updown_table/move_updown_table.class.php
@@ -115,9 +115,8 @@ function invoke() {
         $table->setChanged(true);
 
         // Reorder the structure
-        $structure->orderTables($tables);
-        // Send tables back to structure (the order above break refs)
-        $structure->setTables($tables);
+        $structure->orderTables();
+
         // Recalculate the hash
         $structure->calculateHash(true);