Changeset 3876

Show
Ignore:
Timestamp:
02/21/08 15:18:30 (17 months ago)
Author:
guilhermeblanco
Message:

Merged r3868 in 0.10 and trunk

Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r3795 r3876  
    282282        $i = 0; 
    283283         
    284         if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) { 
     284        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) { 
    285285            $ret[$i] = "    parent::setTableDefinition();"; 
    286286            $i++; 
    … …  
    334334        $i = 0; 
    335335         
    336         if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) { 
     336        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) { 
    337337            $ret[$i] = "    parent::setUp();"; 
    338338            $i++; 
    … …  
    706706            $baseClass['className'] = 'Base' . $baseClass['className']; 
    707707            $baseClass['abstract'] = true; 
    708             $baseClass['override_parent'] = true; 
     708            $baseClass['override_parent'] = false; 
    709709            $baseClass['is_base_class'] = true; 
    710710 

  • trunk/lib/Doctrine/Builder/Record.php

    r3649 r3876  
    287287        $i = 0; 
    288288 
    289         if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) { 
     289        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) { 
    290290            $ret[$i] = "    parent::setTableDefinition();"; 
    291291            $i++; 
    … …  
    344344        $i = 0; 
    345345 
    346         if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) { 
     346        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) { 
    347347            $ret[$i] = "    parent::setUp();"; 
    348348            $i++; 
    … …  
    711711            $baseClass['className'] = 'Base' . $baseClass['className']; 
    712712            $baseClass['abstract'] = true; 
    713             $baseClass['override_parent'] = true; 
     713            $baseClass['override_parent'] = false; 
    714714            $baseClass['is_base_class'] = true; 
    715715