MDL-31616 block editing: show in subcontexts does not work on category pages.

Thanks to Ian David Wild for pointing to the proper fix.
This commit is contained in:
Tim Hunt 2012-12-16 22:39:07 +00:00
parent dbee98b2e6
commit 6fc65ae5c3

View file

@ -1271,7 +1271,10 @@ class block_manager {
} else if ($data = $mform->get_data()) { } else if ($data = $mform->get_data()) {
$bi = new stdClass; $bi = new stdClass;
$bi->id = $block->instance->id; $bi->id = $block->instance->id;
// This may get overwritten by the special case handling below.
$bi->pagetypepattern = $data->bui_pagetypepattern; $bi->pagetypepattern = $data->bui_pagetypepattern;
$bi->showinsubcontexts = $data->bui_contexts;
if (empty($data->bui_subpagepattern) || $data->bui_subpagepattern == '%@NULL@%') { if (empty($data->bui_subpagepattern) || $data->bui_subpagepattern == '%@NULL@%') {
$bi->subpagepattern = null; $bi->subpagepattern = null;
} else { } else {