? .page.tpl.php.swp
? .template.php.swp
? eldir.info
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/eldir/Attic/page.tpl.php,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 page.tpl.php
--- page.tpl.php	26 May 2009 05:29:16 -0000	1.2.2.1
+++ page.tpl.php	27 May 2009 05:03:31 -0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language ?>" lang="<?php print $language ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>">
   <head>
     <?php print $head ?>
     <?php print $styles ?>
@@ -46,12 +46,12 @@
       </div>
     </div><!-- /main -->
 
-    <?php if (!empty($sidebar_right)): ?>
-      <div id="right" class="sidebar"><?php print $sidebar_right ?></div>
+    <?php if (!empty($right)): ?>
+      <div id="right" class="sidebar"><?php print $right ?></div>
     <?php endif; ?>
 
-    <?php if (!empty($sidebar_left)): ?>
-      <div id="left" class="sidebar"><?php print $sidebar_left ?></div>
+    <?php if (!empty($left)): ?>
+      <div id="left" class="sidebar"><?php print $left ?></div>
     <?php endif; ?>
 
   </div></div>
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/eldir/Attic/template.php,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 template.php
--- template.php	13 May 2009 02:47:44 -0000	1.2.2.3
+++ template.php	27 May 2009 05:03:33 -0000
@@ -39,9 +39,9 @@
     $vars['body_classes'] .= " ntype-{$type}";
   }
 
-  $vars['sidebar_left'] = trim($vars['sidebar_left']);
-  $vars['sidebar_right'] = trim($vars['sidebar_right']);
-  $vars['body_classes'] .= empty($vars['sidebar_left']) && empty($vars['sidebar_right']) ? ' wide' : '';
+  $vars['sidebar_left'] = trim($vars['left']);
+  $vars['sidebar_right'] = trim($vars['right']);
+  $vars['body_classes'] .= empty($vars['left']) && empty($vars['right']) ? ' wide' : '';
 
   // Add path-based class for a last line of defense
   if (!empty($_GET['q'])) {
@@ -49,9 +49,9 @@
   }
 
   // Add special body class for error pages
-  if (menu_get_active_item() === 0) {
-    $vars['body_classes'] .= ' error-page';
-  }
+#  if (menu_get_active_item() === 0) {
+#    $vars['body_classes'] .= ' error-page';
+#  }
 
   // Add IE 6 compatibility stylesheet
   $vars['styles_ie6'] = base_path() . path_to_theme() . '/ie6.css';
