RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Merged r3868 in 0.10 and trunk

Browse Source
This commit is contained in:
guilhermeblanco 2008-02-21 15:18:30 +00:00
parent ec0ebeb195
commit 499eaf6cb2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/Builder/Record.php
View File

@ -286,7 +286,7 @@ END;
$i = 0;
if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) {
if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
$ret[$i] = " parent::setTableDefinition();";
$i++;
}
@ -343,7 +343,7 @@ END;
$ret = array();
$i = 0;
if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) {
if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
$ret[$i] = " parent::setUp();";
$i++;
}
@ -710,7 +710,7 @@ END;
$baseClass = $definition;
$baseClass['className'] = 'Base' . $baseClass['className'];
$baseClass['abstract'] = true;
$baseClass['override_parent'] = true;
$baseClass['override_parent'] = false;
$baseClass['is_base_class'] = true;
$this->writeDefinition($baseClass);