MDL-20369 fixed restoring of default sort

diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php
index a1aeb64133cd4bcb6080aa0cc0464600331a637a..b9e36c6e1c81d91e808018f92d53b6b2cef156c1 100644 (file)
--- a/mod/data/restorelib.php
+++ b/mod/data/restorelib.php
@@ -119,9 +119,14 @@ function data_restore_mods($mod,$restore) {
                 $restore_userdata_selected = $restore->mods['data']->userinfo;
             }
 
+            global $fieldids;
             //Restore data_fields first!!! need to hold an array of [oldid]=>newid due to double dependencies
             $status = $status and data_fields_restore_mods ($mod->id, $newid, $info, $restore);
 
+            // now use the new field in the defaultsort
+            $newdefaultsort = empty($fieldids[$database->defaultsort]) ? 0 : $fieldids[$database->defaultsort];
+            set_field('data', 'defaultsort', $newdefaultsort, 'id', $newid);
+
             if ($restore_userdata_selected) {
                 $status = $status and data_records_restore_mods ($mod->id, $newid, $info, $restore);
             }