Changeset 3868

Show
Ignore:
Timestamp:
02/20/08 23:44:24 (17 months ago)
Author:
jwage
Message:

Officially correcting logic errors in schema parsing and model building.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/0.9/lib/Doctrine/Import/Builder.php

    r3846 r3868  
    336336        $i = 0; 
    337337         
    338         if (isset($options['inheritance']['extends']) && !(isset($options['override_parent']) || $options['override_parent'] == false)) { 
     338        if (isset($options['inheritance']['extends']) && ! (isset($options['override_parent']) && $options['override_parent'] == true)) { 
    339339            $ret[$i] = "    parent::setTableDefinition();"; 
    340340            $i++; 
    … …  
    525525        $i = 0; 
    526526         
    527         if (isset($options['inheritance']['extends']) && !(isset($options['override_parent']) && $options['override_parent'] == false)) { 
     527        if (isset($options['inheritance']['extends']) && ! (isset($options['override_parent']) && $options['override_parent'] == true)) { 
    528528            $ret[$i] = "    parent::setUp();"; 
    529529            $i++; 
    … …  
    702702            $baseClass['className'] = 'Base' . $baseClass['className']; 
    703703            $baseClass['abstract'] = true; 
    704             $baseClass['override_parent'] = true; 
     704            $baseClass['override_parent'] = false; 
    705705            $baseClass['is_base_class'] = true; 
    706706