moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

implemented fix for restore problem given in bug #1589

Browse source
This commit is contained in:
gustav_delius 2005-01-15 21:49:22 +00:00
parent 210c6aed36
commit 61e59ace64
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/wiki/backuplib.php
View file

@ -41,7 +41,7 @@
fwrite ($bf,full_tag("PAGENAME",4,false,$wiki->wtype)); fwrite ($bf,full_tag("PAGENAME",4,false,$wiki->wtype));
fwrite ($bf,full_tag("WTYPE",4,false,$wiki->wtype)); fwrite ($bf,full_tag("WTYPE",4,false,$wiki->wtype));
fwrite ($bf,full_tag("EWIKIPRINTTITLE",4,false,$wiki->ewikiprinttitle)); fwrite ($bf,full_tag("EWIKIPRINTTITLE",4,false,$wiki->ewikiprinttitle));
fwrite ($bf,full_tag("HTMLMODE",4,false,$wiki->allowsafehtml)); fwrite ($bf,full_tag("HTMLMODE",4,false,$wiki->htmlmode));
fwrite ($bf,full_tag("EWIKIACCEPTBINARY",4,false,$wiki->ewikiacceptbinary)); fwrite ($bf,full_tag("EWIKIACCEPTBINARY",4,false,$wiki->ewikiacceptbinary));
fwrite ($bf,full_tag("INITIALCONTENT",4,false,$wiki->initialcontent)); fwrite ($bf,full_tag("INITIALCONTENT",4,false,$wiki->initialcontent));
fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$wiki->timemodified)); fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$wiki->timemodified));
@ -88,7 +88,7 @@
foreach ($wiki_entries as $wik_ent) { foreach ($wiki_entries as $wik_ent) {
//Start entry //Start entry
//Print submission contents //Print submission contents
if ($userinfo) { if ($userinfo) {
$dumped_entries++; $dumped_entries++;
if ($dumped_entries == 1) { if ($dumped_entries == 1) {
//Write start tag //Write start tag
@ -111,8 +111,8 @@
} }
} }
if ( $dumped_entries > 0 ) { if ( $dumped_entries > 0 ) {
//Write end tag //Write end tag
$status =fwrite ($bf,end_tag("ENTRIES",4,true)); $status =fwrite ($bf,end_tag("ENTRIES",4,true));
} }
} }
return $status; return $status;

22
mod/wiki/restorelib.php
View file

@ -45,7 +45,7 @@
$wiki->pagename = backup_todb($info['MOD']['#']['PAGENAME']['0']['#']); $wiki->pagename = backup_todb($info['MOD']['#']['PAGENAME']['0']['#']);
$wiki->wtype = backup_todb($info['MOD']['#']['WTYPE']['0']['#']); $wiki->wtype = backup_todb($info['MOD']['#']['WTYPE']['0']['#']);
$wiki->ewikiprinttitle = backup_todb($info['MOD']['#']['EWIKIPRINTTITLE']['0']['#']); $wiki->ewikiprinttitle = backup_todb($info['MOD']['#']['EWIKIPRINTTITLE']['0']['#']);
$wiki->ewikiallowsafehtml = backup_todb($info['MOD']['#']['HTMLMODE']['0']['#']); $wiki->htmlmode = backup_todb($info['MOD']['#']['HTMLMODE']['0']['#']);
$wiki->ewikiacceptbinary = backup_todb($info['MOD']['#']['EWIKIACCEPTBINARY']['0']['#']); $wiki->ewikiacceptbinary = backup_todb($info['MOD']['#']['EWIKIACCEPTBINARY']['0']['#']);
$wiki->initialcontent = backup_todb($info['MOD']['#']['INITIALCONTENT']['0']['#']); $wiki->initialcontent = backup_todb($info['MOD']['#']['INITIALCONTENT']['0']['#']);
$wiki->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']); $wiki->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
@ -118,18 +118,18 @@
//If userinfo was selected, restore the entry //If userinfo was selected, restore the entry
if ($restore->mods['wiki']->userinfo) { if ($restore->mods['wiki']->userinfo) {
//The structure is equal to the db, so insert the wiki_entries //The structure is equal to the db, so insert the wiki_entries
$newid = insert_record ("wiki_entries",$entry); $newid = insert_record ("wiki_entries",$entry);
//Do some output //Do some output
if (($i+1) % 50 == 0) { if (($i+1) % 50 == 0) {
echo "."; echo ".";
if (($i+1) % 1000 == 0) { if (($i+1) % 1000 == 0) {
echo "<br />"; echo "<br />";
} }
backup_flush(300); backup_flush(300);
} }
if ($newid) { if ($newid) {
//We have the newid, update backup_ids //We have the newid, update backup_ids
backup_putid($restore->backup_unique_code,"wiki_entries",$oldid,$newid); backup_putid($restore->backup_unique_code,"wiki_entries",$oldid,$newid);
//Get old wiki id from backup_ids //Get old wiki id from backup_ids
$rec = get_record("backup_ids","backup_code",$restore->backup_unique_code, $rec = get_record("backup_ids","backup_code",$restore->backup_unique_code,
@ -141,8 +141,8 @@
//Restore wiki_pages //Restore wiki_pages
$status = wiki_pages_restore_mods($oldid,$newid,$ent_info,$restore); $status = wiki_pages_restore_mods($oldid,$newid,$ent_info,$restore);
} else { } else {
$status = false; $status = false;
} }
} }
} }
return $status; return $status;