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

This commit is contained in:
Eloy Lafuente (stronk7) 2012-02-27 18:54:35 +01:00
commit edb03ff65b

View file

@ -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;