Permalink
Browse files

Merge branch 'MDL-29256-resource-format_21_STABLE' of git://github.co…

…m/mudrd8mz/moodle into MOODLE_21_STABLE
  • Loading branch information...
2 parents 8e53b91 + a158c5c commit 82f4e1f838bb4cc681e1a6dec5ff97a5e25dfc17 @stronk7 stronk7 committed Feb 27, 2012
Showing with 11 additions and 4 deletions.
  1. +11 −4 mod/page/backup/moodle1/lib.php
@@ -53,11 +53,18 @@ public function process_legacy_resource(array $data) {
$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;

0 comments on commit 82f4e1f

Please sign in to comment.