From e59f33705a8c2b5604861d7a293ff83d819bc832 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 22 Dec 2011 17:40:27 +0000 Subject: [PATCH] // Fix profiles creation git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11649 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/ObjectModel.php | 5 ++++- install-new/classes/xmlLoader.php | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 85ec3df3e..82619f7f8 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -233,7 +233,10 @@ abstract class ObjectModelCore public function getFields() { $this->validateFields(); - return $this->formatFields(); + $fields = $this->formatFields(); + if (!$fields) + $fields[$this->def['primary']] = $this->id; + return $fields; } /** diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php index d829774ea..1173e9cee 100644 --- a/install-new/classes/xmlLoader.php +++ b/install-new/classes/xmlLoader.php @@ -197,8 +197,6 @@ class InstallXmlLoader } while ($current != $sort_entities); - $start = microtime(true); - // Populate entities foreach ($sort_entities as $entity) {