Merge pull request #489 from havvg/hotfix/behavior-parentclass

fix duplicate use of parentClass from behaviors
propelorm · Oct 23, 2012 · 9d4763a · 9d4763a
2 parents 65def77 + a9b91e5
commit 9d4763a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/generator/lib/builder/om/PHP5ObjectBuilder.php b/generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -193,12 +193,14 @@ protected function addClassOpen(&$script)
         $tableName = $table->getName();
         $tableDesc = $table->getDescription();
         $parentClass = $this->getBehaviorContent('parentClass');
-        $parentClass = (null !== $parentClass) ? $parentClass : ClassTools::classname($this->getBaseClass());
+        if (null === $parentClass) {
+            $parentClass = ClassTools::classname($this->getBaseClass());
 
-        if (false === strpos($this->getBaseClass(), '.')) {
-            $this->declareClass($this->getBaseClass());
-        } else {
-            $this->declareClass($parentClass);
+            if (false === strpos($this->getBaseClass(), '.')) {
+                $this->declareClass($this->getBaseClass());
+            } else {
+                $this->declareClass($parentClass);
+            }
         }
 
         if ($this->getBuildProperty('addClassLevelComment')) {