From bc63c4bac3f95372fc92ef93817b5d4806c9ca7b Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 10 Nov 2006 04:20:57 +0000
Subject: [PATCH] field data should be backed up/restored regardless of whether
 user data is selected

---
 mod/data/backuplib.php  | 4 +++-
 mod/data/restorelib.php | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mod/data/backuplib.php b/mod/data/backuplib.php
index 79a1e3750f6..d212b2df7b4 100644
--- a/mod/data/backuplib.php
+++ b/mod/data/backuplib.php
@@ -103,13 +103,15 @@ function data_backup_one_mod($bf,$preferences,$data) {
     
     // if we've selected to backup users info, then call any other functions we need
     // including backing up individual files
+    
+    $status = backup_data_fields($bf,$preferences,$data->id);
+
     if (backup_userdata_selected($preferences,'data',$data->id)) {
         //$status = backup_someuserdata_for_this_instance();
         //$status = backup_somefiles_for_this_instance();
         // ... etc
 
         $status = backup_data_records($bf,$preferences,$data->id);
-        $status = backup_data_fields($bf,$preferences,$data->id);
         if ($status) {
             $status = backup_data_files_instance($bf,$preferences,$data->id);    //recursive copy
         }
diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php
index 1adf4d45f50..c63ac7bfa94 100644
--- a/mod/data/restorelib.php
+++ b/mod/data/restorelib.php
@@ -98,10 +98,10 @@ function data_restore_mods($mod,$restore) {
                 // Moodle 1.5
 	            $restore_userdata_selected = $restore->mods['data']->userinfo;
             }
+            //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);
             if ($restore_userdata_selected) {
-                //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);
-                $status = $status and data_records_restore_mods ($mod->id, $newid, $info, $restore);
+               $status = $status and data_records_restore_mods ($mod->id, $newid, $info, $restore);
 
             }
         } else {