Merge branch 'wip-MDL-48366-m27' of git://github.com/marinaglancy/moo…

…dle into MOODLE_27_STABLE
moodle · Dec 9, 2014 · 0f5ebed · 0f5ebed
2 parents 5e9b48a + 44af708
commit 0f5ebed
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/blocks/edit_form.php b/blocks/edit_form.php
@@ -84,6 +84,12 @@ function definition() {
         $weightoptions[$last] = get_string('bracketlast', 'block', $last);
 
         $regionoptions = $this->page->theme->get_all_block_regions();
+        foreach ($this->page->blocks->get_regions() as $region) {
+            // Make sure to add all custom regions of this particular page too.
+            if (!isset($regionoptions[$region])) {
+                $regionoptions[$region] = $region;
+            }
+        }
 
         $parentcontext = context::instance_by_id($this->block->instance->parentcontextid);
         $mform->addElement('hidden', 'bui_parentcontextid', $parentcontext->id);