Development

Changeset 8261

You must first sign up to be able to contribute.

Changeset 8261

Show
Ignore:
Timestamp:
04/04/08 11:13:47 (8 months ago)
Author:
noel
Message:

fixed relative file search with sfFinder (backported from 1.1)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/lib/util/sfFinder.class.php

    r8259 r8261  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
     
    310310    $here_dir = getcwd(); 
    311311    $numargs  = func_num_args(); 
    312     $arg_list = func_get_args();  
     312    $arg_list = func_get_args(); 
    313313 
    314314    // first argument is an array? 
     
    338338      } 
    339339 
     340      $dir = str_replace(array('/', '\\'), '/', $dir); 
     341 
    340342      if ($this->relative) 
    341343      { 
    342         $files = array_merge($files, str_replace($dir.DIRECTORY_SEPARATOR, '', $this->search_in($dir))); 
     344        $files = array_merge($files, str_replace($dir.DIRECTORY_SEPARATOR, '', str_replace(array('/', '\\'), '/', $this->search_in($dir)))); 
    343345      } 
    344346      else