diff --git a/lib/pagelib.php b/lib/pagelib.php index 19940fb2cf2..8ebb63bff2c 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -1852,7 +1852,14 @@ class moodle_page { */ public function apply_theme_region_manipulations($region) { if ($this->blockmanipulations && isset($this->blockmanipulations[$region])) { - return $this->blockmanipulations[$region]; + $regionwas = $region; + $regionnow = $this->blockmanipulations[$region]; + if ($this->blocks->is_known_region($regionwas) && $this->blocks->is_known_region($regionnow)) { + // Both the before and after regions are known so we can swap them over. + return $regionnow; + } + // We didn't know about both, we won't swap them over. + return $regionwas; } return $region; } diff --git a/theme/bootstrapbase/layout/columns1.php b/theme/bootstrapbase/layout/columns1.php index 2d3f4174f6c..09125104c43 100644 --- a/theme/bootstrapbase/layout/columns1.php +++ b/theme/bootstrapbase/layout/columns1.php @@ -60,16 +60,14 @@ echo $OUTPUT->doctype() ?> -
-
-
- course_content_header(); - echo $OUTPUT->main_content(); - echo $OUTPUT->course_content_footer(); - ?> -
-
+
+
+ course_content_header(); + echo $OUTPUT->main_content(); + echo $OUTPUT->course_content_footer(); + ?> +
-
-
-
- course_content_header(); - echo $OUTPUT->main_content(); - echo $OUTPUT->course_content_footer(); - ?> -
-
+
+
+ course_content_header(); + echo $OUTPUT->main_content(); + echo $OUTPUT->course_content_footer(); + ?> +