// Fix little bug on preactivation (property_exists)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9411 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-10-18 09:59:49 +00:00
1 parent 3638cdc3c9
commit 39f37e465f
1 file changed
+2 -2
+2 -2
View File
@@ -5,9 +5,9 @@
$_GET['language'] = 0; $_GET['language'] = 0;
function getPreinstallXmlLang($object, $field) function getPreinstallXmlLang($object, $field)
{ {
if (ToolsCore::property_exists($object, $field.'_'.((int)($_GET['language'])+1))) if (property_exists($object, $field.'_'.((int)($_GET['language'])+1)))
return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_'.((int)($_GET['language'])+1)})); return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_'.((int)($_GET['language'])+1)}));
if (ToolsCore::property_exists($object, $field.'_1')) if (property_exists($object, $field.'_1'))
return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_1'})); return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_1'}));
return ''; return '';
} }