Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

lib/outputrenderers.php

@@ -1392,7 +1392,6 @@ class core_renderer extends renderer_base {
      * @return string the HTML to be output.
      */
     public function blocks_for_region($region) {
-        $region = $this->page->apply_theme_region_manipulations($region);
         $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
         $blocks = $this->page->blocks->get_blocks_for_region($region);
         $lastblock = null;
@@ -3225,8 +3224,8 @@ EOD;
             'data-blockregion' => $displayregion,
             'data-droptarget' => '1'
         );
-        if ($this->page->blocks->region_has_content($region, $this)) {
-            $content = $this->blocks_for_region($region);
+        if ($this->page->blocks->region_has_content($displayregion, $this)) {
+            $content = $this->blocks_for_region($displayregion);
         } else {
             $content = '';
         }

theme/bootstrapbase/less/moodle/core.less

@@ -14,11 +14,17 @@
     display:none;
 }
 
-.empty-region-side-post #region-bs-main-and-pre.span9 {
-    width:100%;
+.empty-region-side-post #region-bs-main-and-pre.span9,
+.empty-region-side-pre #region-bs-main-and-post.span9,
+.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8 {
+    /** LTR with no post area. 
+        RTL with no pre area.
+        RTL with no post area. **/
+    width: 100%;
 }
 
-.empty-region-side-pre #region-main {
+.empty-region-side-pre #region-bs-main-and-pre.span9 #region-main {
+    /** LTR with no pre area. **/
     float:none;
     width:100%;
 }
@@ -32,9 +38,9 @@
     .fluid-span(3);
 }
 
-.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8 {
-    /** RTL with no post area. **/
-    width:100%;
+.empty-region-side-pre #region-bs-main-and-post.span9 #region-main.span8 {
+    /** RTL with no pre area. **/
+    float: right;
 }
 
 /** Page layout CSS ends **/