summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--alpha/preprocess/preprocess-page.inc10
-rw-r--r--alpha/preprocess/preprocess-region.inc2
2 files changed, 9 insertions, 3 deletions
diff --git a/alpha/preprocess/preprocess-page.inc b/alpha/preprocess/preprocess-page.inc
index 10041ef..0be7f3f 100644
--- a/alpha/preprocess/preprocess-page.inc
+++ b/alpha/preprocess/preprocess-page.inc
@@ -50,6 +50,8 @@ function alpha_alpha_preprocess_page(&$vars) {
$primary['#region']['columns'] = $item['columns'] - $primary['#region']['prefix'] - $primary['#region']['suffix'];
$primary['#region']['width'] = $item['columns'];
+ $pull = array();
+
foreach ($regions[$zone] as $region => $info) {
if ($region != $item['primary']) {
$primary['#region']['columns'] -= $info['#region']['width'];
@@ -57,11 +59,15 @@ function alpha_alpha_preprocess_page(&$vars) {
if ($primary['#region']['weight'] > $info['#region']['weight']) {
$primary['#region']['push'] += $info['#region']['width'];
- $regions[$zone][$region]['#region']['pull'] = &$primary['#region']['width'];
+ $pull[$region] = &$primary['#region']['width'];
}
}
}
- }
+
+ foreach ($pull as $region => $value) {
+ $regions[$zone][$region]['#region']['pull'] = $value;
+ }
+ }
$vars['page'][$item['section'] . '_section'][$zone] = $regions[$zone];
$vars['page'][$item['section'] . '_section'][$zone]['#theme_wrappers'][] = 'zone';
diff --git a/alpha/preprocess/preprocess-region.inc b/alpha/preprocess/preprocess-region.inc
index 7832fd4..8933c5a 100644
--- a/alpha/preprocess/preprocess-region.inc
+++ b/alpha/preprocess/preprocess-region.inc
@@ -1,6 +1,6 @@
<?php
-function alpha_alpha_preprocess_region(&$vars) {
+function alpha_alpha_preprocess_region(&$vars) {
$region = $vars['elements']['#region'];
$zone = $vars['elements']['#zone'];