Doctrine

Timestamp:

06/06/08 15:15:40 (13 months ago)

Author:

jwage

Message:

fixes #1088

Files:

• branches/0.11/lib/Doctrine/Import/Builder.php (modified) (3 diffs)

branches/0.11/lib/Doctrine/Import/Builder.php

@@ -904 +904 @@
             // If we have a package then we need to make this extend the package definition and not the base definition
             // The package definition will then extends the base definition
-            $topLevel['inheritance']['extends'] = (isset($topLevel['package']) && $topLevel['package']) ? $this->_packagesPrefix . $topLevel['className']:'Base' . $topLevel['className'];
+            $topLevel['inheritance']['extends'] = (isset($topLevel['package']) && $topLevel['package']) ? $this->_packagesPrefix . $topLevel['className']:$this->_baseClassPrefix . $topLevel['className'];
             $topLevel['no_definition'] = true;
             $topLevel['generate_once'] = true;
@@ -915 +915 @@
                 $packageLevel = $definition;
                 $packageLevel['className'] = $topLevel['inheritance']['extends'];
-                $packageLevel['inheritance']['extends'] = 'Base' . $topLevel['className'];
+                $packageLevel['inheritance']['extends'] = $this->_baseClassPrefix . $topLevel['className'];
                 $packageLevel['no_definition'] = true;
                 $packageLevel['abstract'] = true;
@@ -934 +934 @@
 
             $baseClass = $definition;
-            $baseClass['className'] = 'Base' . $baseClass['className'];
+            $baseClass['className'] = $this->_baseClassPrefix . $baseClass['className'];
             $baseClass['abstract'] = true;
             $baseClass['override_parent'] = false;