Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

2013-01-15 20:16:29 +01:00
parent 09ebf8386a 6fc65ae5c3
commit 5f2d7b3009
1 changed files with 3 additions and 0 deletions
@@ -1271,7 +1271,10 @@ class block_manager {
        } else if ($data = $mform->get_data()) {
            $bi = new stdClass;
            $bi->id = $block->instance->id;
+
+            // This may get overwritten by the special case handling below.
            $bi->pagetypepattern = $data->bui_pagetypepattern;
+            $bi->showinsubcontexts = $data->bui_contexts;
            if (empty($data->bui_subpagepattern) || $data->bui_subpagepattern == '%@NULL@%') {
                $bi->subpagepattern = null;
            } else {