Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #490 from jpetitcolas/master

Fix issue #480 with concrete_inheritance and namespace
  • Loading branch information...
commit d1b1334e7239635fa7b1966b4cfb4b0e1c2d1683 2 parents 9d4763a + 624b87b
@willdurand willdurand authored
View
2  generator/lib/behavior/concrete_inheritance/ConcreteInheritanceBehavior.php
@@ -207,7 +207,7 @@ public function getParentOrCreate(\$con = null)
if (null === (\$parent = \$this->get". $parentClass . "(\$con))) {
\$parent = new " . $parentClass . "();
}
- \$parent->set" . $this->getParentTable()->getColumn($this->getParameter('descendant_column'))->getPhpName() . "('" . $this->builder->getStubObjectBuilder()->getClassname() . "');
+ \$parent->set" . $this->getParentTable()->getColumn($this->getParameter('descendant_column'))->getPhpName() . "('" . $this->builder->getStubObjectBuilder()->getFullyQualifiedClassname() . "');
return \$parent;
} else {
View
2  generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -253,7 +253,7 @@ protected function addClassBody(&$script)
$this->declareClassFromBuilder($this->getStubPeerBuilder());
$this->declareClassFromBuilder($this->getStubQueryBuilder());
$this->declareClasses(
- 'Propel', 'PropelException', 'PDO', 'PropelPDO', 'Criteria',
+ 'Propel', 'PropelException', 'PDO', 'PropelPDO', 'PropelQuery', 'Criteria',
'Persistent', 'BasePeer', 'PropelCollection',
'PropelObjectCollection', 'Exception'
);
Please sign in to comment.
Something went wrong with that request. Please try again.