summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc8
-rw-r--r--includes/theme.maintenance.inc8
2 files changed, 8 insertions, 8 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index d91386166..15795e68b 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1898,11 +1898,11 @@ function template_preprocess_page(&$variables) {
// Set up layout variable.
$variables['layout'] = 'none';
- if (!empty($variables['page']['left'])) {
- $variables['layout'] = 'left';
+ if (!empty($variables['page']['sidebar_first'])) {
+ $variables['layout'] = 'first';
}
- if (!empty($variables['page']['right'])) {
- $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right';
+ if (!empty($variables['page']['sidebar_second'])) {
+ $variables['layout'] = ($variables['layout'] == 'first') ? 'both' : 'second';
}
// Construct page title
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 291b927c5..2dacf27ab 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -238,11 +238,11 @@ function template_preprocess_maintenance_page(&$variables) {
// Setup layout variable.
$variables['layout'] = 'none';
- if (!empty($variables['left'])) {
- $variables['layout'] = 'left';
+ if (!empty($variables['sidebar_first'])) {
+ $variables['layout'] = 'first';
}
- if (!empty($variables['right'])) {
- $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right';
+ if (!empty($variables['sidebar_second'])) {
+ $variables['layout'] = ($variables['layout'] == 'first') ? 'both' : 'second';
}
// Construct page title