From 00047b3bea98b9976ede1772602016506484d3fa Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Mon, 4 Jun 2012 08:41:31 +0000
Subject: [PATCH] // toolbar one more time

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15804 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/controller/AdminController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 34fe903be..b3ce8362d 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1366,6 +1366,7 @@ class AdminControllerCore extends Controller
 		}
 		elseif (!$this->ajax)
 		{
+
 			$this->content .= $this->renderList();
 			$this->content .= $this->renderOptions();
 
@@ -1493,9 +1494,9 @@ class AdminControllerCore extends Controller
 	{
 		if ($this->fields_options && is_array($this->fields_options))
 		{
-			if (isset($this->display) && $this->display != 'options')
+			if (isset($this->display) && $this->display != 'options' && $this->display != 'list')
 				$this->show_toolbar = false;
-			else if (!isset($this->display))
+			else
 				$this->display = 'options';
 
 			unset($this->toolbar_btn);