From ae7b4a10abd6ce718d041f19fb83376ae7498317 Mon Sep 17 00:00:00 2001
From: mBertholino <mathieu.bertholino@prestashop.com>
Date: Mon, 26 Dec 2011 14:41:29 +0000
Subject: [PATCH] [-] BO : Attributes can now be deleted in Catalogue :
 Attributes and Groups

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

diff --git a/classes/AdminController.php b/classes/AdminController.php
index 9861ce636..e2ba59697 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -717,8 +717,9 @@ class AdminControllerCore extends Controller
 		$this->_errors = array_unique($this->_errors);
 		if (count($this->_errors) > 0)
 			return;
-
-		return $object;
+		if (isset($object))
+			return $object;
+		return;
 	}
 
 	/**
diff --git a/classes/Attribute.php b/classes/Attribute.php
index ab2eb4eae..8392f60d9 100644
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -320,9 +320,9 @@ class AttributeCore extends ObjectModel
 
 		// when delete, you must use $use_last_attribute
 		if ($use_last_attribute)
-			$sql .= 'AND `id_attribute` != '.(int)$this->id;
+			$sql .= ' AND `id_attribute` != '.(int)$this->id;
 
-		$sql .= 'ORDER BY `position`';
+		$sql .= ' ORDER BY `position`';
 
 		$result = Db::getInstance()->executeS($sql);