From 77246c8d752f932cdaf6d070e6cd62df2d4b643b Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 25 Oct 2012 14:24:14 +0000 Subject: [PATCH] [-] Core : Fix #PSCFV-5194 object instead of object name stored in class definition --- classes/ObjectModel.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 8b3964ffe..fc3ee68fb 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1414,7 +1414,12 @@ abstract class ObjectModelCore { $reflection = new ReflectionClass($class); $definition = $reflection->getStaticPropertyValue('definition'); - $definition['classname'] = $class; + + if (is_object($class)) + $definition['classname'] = get_class($class); + else + $definition['classname'] = $class; + if (!empty($definition['multilang'])) $definition['associations'][Collection::LANG_ALIAS] = array( 'type' => self::HAS_MANY,