Merged from 14_STABLE

Bug 1788
(http://moodle.org/bugs/bug.php?op=show&bugid=1788)

diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index 9e50e97a5b015c9049f5e5eeaf2b7f897ec49dac..d2a683f397eb5d961e3f1c0ff336fa560e68953a 100644 (file)
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -97,8 +97,6 @@
 
             //We'll need this later!!
             $oldid = backup_todb($ent_info['#']['ID']['0']['#']);
-            $olduserid = backup_todb($ent_info['#']['USERID']['0']['#']);
-            $oldgroupid = backup_todb($ent_info['#']['GROUPID']['0']['#']);
 
             //Now, build the wiki_ENTRIES record structure
             $entry->wikiid = $new_wiki_id;
@@ -177,11 +175,18 @@
             $page->flags = backup_todb($pag_info['#']['FLAGS']['0']['#']);
             $page->content = backup_todb($pag_info['#']['CONTENT']['0']['#']);
             $page->author = backup_todb($pag_info['#']['AUTHOR']['0']['#']);
+            $page->userid = backup_todb($pag_info['#']['USERID']['0']['#']);
             $page->created = backup_todb($pag_info['#']['CREATED']['0']['#']);
             $page->lastmodified = backup_todb($pag_info['#']['LASTMODIFIED']['0']['#']);
             $page->refs = backup_todb($pag_info['#']['REFS']['0']['#']);
             $page->meta = backup_todb($pag_info['#']['META']['0']['#']);
             $page->hits = backup_todb($pag_info['#']['HITS']['0']['#']);
+
+            //We have to recode the userid field
+            $user = backup_getid($restore->backup_unique_code,"user",$page->userid);
+            if ($user) {
+                $page->userid = $user->new_id;
+            }
             //The structure is equal to the db, so insert the wiki_comments
             insert_record ("wiki_pages",$page, false,"pagename");
 #print "<pre>"; print_r($page); print "</pre>";            
@@ -259,4 +264,4 @@
 
         return $status;
     }
-?>
\ No newline at end of file
+?>