From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 27 Feb 2012 17:53:03 +0000 (+0100)
Subject: Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle
X-Git-Tag: v2.3.0-beta~1136
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=516b956a28f81a0fd0ca1b8f1dfdd537a6e3bc29;hp=92f901158f1c6c21b1bad809a15826644182482a

Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle
---

diff --git a/mod/page/backup/moodle1/lib.php b/mod/page/backup/moodle1/lib.php
index f0783ee413e..c917a1693e1 100644
--- a/mod/page/backup/moodle1/lib.php
+++ b/mod/page/backup/moodle1/lib.php
@@ -53,11 +53,18 @@ class moodle1_mod_page_handler extends moodle1_resource_successor_handler {
         $page['intro']              = $data['intro'];
         $page['introformat']        = $data['introformat'];
         $page['content']            = $data['alltext'];
-        $page['contentformat']      = (int)$data['reference'];
 
-        // this is unexpected but just in case (the same step applied during upgrade)
-        if ($page['contentformat'] < 0 or $page['contentformat'] > 4) {
-            $page['contentformat']  = FORMAT_MOODLE;
+        if ($data['type'] === 'html') {
+            // legacy Resource of the type Web page
+            $page['contentformat'] = FORMAT_HTML;
+
+        } else {
+            // legacy Resource of the type Plain text page
+            $page['contentformat'] = (int)$data['reference'];
+
+            if ($page['contentformat'] < 0 or $page['contentformat'] > 4) {
+                $page['contentformat'] = FORMAT_MOODLE;
+            }
         }
 
         $page['legacyfiles']        = RESOURCELIB_LEGACYFILES_ACTIVE;