From 7feb91ad90bce9e7e76999fab6c58e857ec7fc5b Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Tue, 24 Aug 2010 06:45:33 +0000 Subject: [PATCH] "MDL-23819, old wiki has binary data stored in db, which is not supported anymore, so we have to ignore the bad data without breaking upgrade process" --- mod/wiki/db/upgradelib.php | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/mod/wiki/db/upgradelib.php b/mod/wiki/db/upgradelib.php index 37735cf2936..6418874fc11 100644 --- a/mod/wiki/db/upgradelib.php +++ b/mod/wiki/db/upgradelib.php @@ -285,15 +285,25 @@ function wiki_upgrade_migrate_versions() { if ($version->version == 1) { // The oldest version of page in moodle 2.0 is 0 which has empty content // so we need to insert an extra record - $content = $version->content; - $version->version = 0; - $version->content == ''; - $DB->insert_record('wiki_versions', $version); - $version->version = 1; - $version->content == $content; - $DB->insert_record('wiki_versions', $version); + try { + $content = $version->content; + $version->version = 0; + $version->content = ''; + $DB->insert_record('wiki_versions', $version); + $version->version = 1; + $version->content = $content; + $DB->insert_record('wiki_versions', $version); + } catch (Exception $e) { + echo $OUTPUT->notification('Cannot insert this record'); + print_object($version); + } } else { - $DB->insert_record('wiki_versions', $version); + try { + $DB->insert_record('wiki_versions', $version); + } catch (Exception $e) { + echo $OUTPUT->notification('Cannot insert this record'); + print_object($version); + } } $pagesinfo->next();