From 89329dc865d248bde0085fbdf2a4e8eae223abe8 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Mon, 2 Dec 2013 15:15:17 +0100
Subject: [PATCH] // small fix

---
 themes/default-bootstrap/footer.tpl | 3 +--
 themes/default-bootstrap/header.tpl | 7 ++-----
 themes/default-bootstrap/layout.tpl | 3 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/themes/default-bootstrap/footer.tpl b/themes/default-bootstrap/footer.tpl
index 36dc90b44..63d62cee5 100644
--- a/themes/default-bootstrap/footer.tpl
+++ b/themes/default-bootstrap/footer.tpl
@@ -22,10 +22,9 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
 		{if !$content_only}
                     </div>
-    {if isset($right_column) && !empty($right_column)}
+    {if isset($right_column_size) && !empty($right_column_size)}
     <!-- Right -->
         <div id="right_column" class="col-xs-12 col-sm-3 column">
             {$HOOK_RIGHT_COLUMN}
diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index b1c1e8f60..a3619f93e 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -208,15 +208,12 @@
                         {include file="$tpl_dir./breadcrumb.tpl"}
                     {/if}
                     <div class="row">
-						{assign var='left_column' value=0}{assign var='right_column' value=0}
-						{if isset($HOOK_LEFT_COLUMN) && $HOOK_LEFT_COLUMN|trim && !$hide_left_column}{$left_column=3}{/if}
-						{if isset($HOOK_RIGHT_COLUMN) && $HOOK_RIGHT_COLUMN|trim && !$hide_right_column}{$right_column=3}{/if}
-						{if isset($left_column) && !empty($left_column)}
+						{if isset($left_column_size) && !empty($left_column_size)}
 						<!-- Left -->
                         <div id="left_column" class="column col-xs-12 col-sm-3">
 							{$HOOK_LEFT_COLUMN}
                         </div>
 						{/if}
                     	<!-- Center -->
-                    	<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column - $right_column}">
+                    	<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
 	{/if}
\ No newline at end of file
diff --git a/themes/default-bootstrap/layout.tpl b/themes/default-bootstrap/layout.tpl
index 6ea4bc8d0..ed911c5fe 100644
--- a/themes/default-bootstrap/layout.tpl
+++ b/themes/default-bootstrap/layout.tpl
@@ -23,6 +23,9 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+{assign var='left_column_size' value=0}{assign var='right_column_size' value=0}
+{if isset($HOOK_LEFT_COLUMN) && $HOOK_LEFT_COLUMN|trim && !$hide_left_column}{$left_column_size=3}{/if}
+{if isset($HOOK_RIGHT_COLUMN) && $HOOK_RIGHT_COLUMN|trim && !$hide_right_column}{$right_column_size=3}{/if}
 {if !empty($display_header)}{include file="$tpl_dir./header.tpl" HOOK_HEADER=$HOOK_HEADER}{/if}
 {if !empty($template)}{$template}{/if}
 {if !empty($display_footer)}{include file="$tpl_dir./footer.tpl"}{/if}