From b39c8e73ab4a043dcbf6f6c99ca100692fedf6ee Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Thu, 3 Nov 2011 10:24:31 +0000
Subject: [PATCH] // Fix bug controller AdminCategoriesController (PSFV-94)

---
 admin-dev/themes/template/toolbar.tpl         | 29 ++++++++++---------
 .../admin/AdminCategoriesController.php       |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/admin-dev/themes/template/toolbar.tpl b/admin-dev/themes/template/toolbar.tpl
index 29c1583e3..c039e2427 100644
--- a/admin-dev/themes/template/toolbar.tpl
+++ b/admin-dev/themes/template/toolbar.tpl
@@ -23,18 +23,19 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
-<div class="toolbarBox">
-	<ul class="cc_button">
-		{foreach from=$toolbar_btn item=btn key=k}
-			<li>
-				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
-				</a>
-			</li>
-		{/foreach}
-	</ul>
-	<div class="pageTitle">{* todo : what to display as title for each items (table_lang.name ? *}
-		<h3><span id="current_obj" style="font-weight: normal;">{$current_obj_name|default:'&nbsp;'}</span></h3>
+{if count($toolbar_btn) > 0}
+	<div class="toolbarBox">
+			<ul class="cc_button">
+				{foreach from=$toolbar_btn item=btn key=k}
+					<li>
+						<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
+							<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+						</a>
+					</li>
+				{/foreach}
+			</ul>
+		<div class="pageTitle">{* todo : what to display as title for each items (table_lang.name ? *}
+			<h3><span id="current_obj" style="font-weight: normal;">{$current_obj_name|default:'&nbsp;'}</span></h3>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 2db460596..2541af438 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -98,7 +98,7 @@ class AdminCategoriesControllerCore extends AdminController
 
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 
-		$this->_filter .= 'AND `id_parent` = '.(int)$this->_category->id;
+		$this->_filter .= 'AND `id_parent` = '.(int)$this->_category->id.' ';
 		$this->_select = 'position ';
 
 		$categories_tree = $this->_category->getParentsCategories($this->context->language->id);
@@ -124,7 +124,7 @@ class AdminCategoriesControllerCore extends AdminController
 	public function initView()
 	{
 		$this->initToolbar();
-		$this->content .= $this->initList();
+		return $this->initList();
 	}
 
 	public function initToolbar()