Changeset 76

Show
Ignore:
Timestamp:
05/23/06 14:25:25 (2 years ago)
Author:
hans
Message:
  • ticket:42 - Added Matthias' fix for premature runtime configurable to branch.
  • ticket:43 - Also added fix for top-level configuration of container tasks.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2/classes/phing/parser/TaskHandler.php

    r1 r76  
    165165            $this->wrapper = $this->task->getRuntimeConfigurableWrapper(); 
    166166            $this->wrapper->setAttributes($attrs); 
     167            /* 
     168                        Commenting this out as per thread on Premature configurate of ReuntimeConfigurables  
     169            with Matthias Pigulla: http://phing.tigris.org/servlets/ReadMsg?list=dev&msgNo=251 
     170             
    167171                        if ($this->parentWrapper !== null) { // this may not make sense only within this if-block, but it 
    168172                                                                                                // seems to address current use cases adequately 
    169173                        $this->parentWrapper->addChild($this->wrapper); 
    170174                        } 
     175                        */ 
    171176        } else { 
    172177            $this->task->init(); 
    …… 
    179184     */ 
    180185    protected function finished() { 
    181         if ($this->task !== null && $this->target === null) { 
     186        if ($this->task !== null && $this->target === null && $this->container === null) { 
    182187            try { 
    183188                $this->task->main();