From 0bd7fcbf38d71df62904bd4c86046e9c85c9085d Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 3 Aug 2009 03:04:34 +0000
Subject: #226587 by JohnAlbin, E.Z, et al: Make sidebar regions semantic and
 RTL-friendly.

---
 includes/theme.inc             | 8 ++++----
 includes/theme.maintenance.inc | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'includes')

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
-- 
cgit v1.2.3