Commit 48adf067 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Stopping a block from being 'eaten' when changing layout (Bug #1432635)"

parents b13398fa 34bf39b0
...@@ -2524,7 +2524,7 @@ class View { ...@@ -2524,7 +2524,7 @@ class View {
$currentcol = 1; $currentcol = 1;
} }
if ($currentcol == $values['column']) { if ($currentcol == $values['column']) {
$currentcol++; // don't redistrubute blocks here! // don't redistrubute blocks here!
} }
if (!array_key_exists($currentcol, $prevrowcolumnmax)) { if (!array_key_exists($currentcol, $prevrowcolumnmax)) {
$prevrowcolumnmax[$currentcol] = $this->get_current_max_order($values['row']-1, $currentcol); $prevrowcolumnmax[$currentcol] = $this->get_current_max_order($values['row']-1, $currentcol);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment