Changeset 359

Show
Ignore:
Timestamp:
02/26/08 09:16:23 (4 months ago)
Author:
mrook
Message:

#224 - fix path duplicates (patch by Benjamin Stover)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.3/classes/phing/types/Path.php

    r325 r359  
    311311 
    312312        $tok = new PathTokenizer($source); 
    313         $element = ""; 
    314         while ($tok->hasMoreTokens()) {             
     313        while ($tok->hasMoreTokens()) { 
    315314            $pathElement = $tok->nextToken(); 
    316315            try { 
    317                 $element .= self::resolveFile($project, $pathElement); 
     316                $element = self::resolveFile($project, $pathElement); 
     317                for ($i = 0, $_i=strlen($element); $i < $_i; $i++) { 
     318                    self::translateFileSep($element, $i); 
     319                } 
     320                $result[] = $element; 
    318321            } catch (BuildException $e) { 
    319                 $this->project->log("Dropping path element " . $pathElement  
    320                     . " as it is not valid relative to the project",  
     322                $this->project->log("Dropping path element " . $pathElement 
     323                    . " as it is not valid relative to the project", 
    321324                    Project::MSG_VERBOSE); 
    322325            } 
    323              
    324             for ($i = 0, $_i=strlen($element); $i < $_i; $i++) { 
    325                 self::translateFileSep($element, $i); 
    326             } 
    327             $result[] = $element; 
    328326        } 
    329327