Development

Changeset 8254

You must first sign up to be able to contribute.

Changeset 8254

Show
Ignore:
Timestamp:
04/04/08 10:16:09 (6 months ago)
Author:
noel
Message:

fixed #2958, #2416, #3110 : relative file search with sfFinder (closes #3110)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/util/sfFinder.class.php

    r8148 r8254  
    370370      } 
    371371 
     372      $dir = str_replace(array('/', '\\'), '/', $dir); 
     373 
    372374      if ($this->relative) 
    373375      { 
    374         $files = array_merge($files, str_replace($dir.DIRECTORY_SEPARATOR, '', $finder->search_in($dir))); 
     376        $dir   = rtrim($dir, '/'); 
     377        $files = array_merge($files, str_replace($dir.'/', '', str_replace(array('/', '\\'), '/', $finder->search_in($dir)))); 
    375378      } 
    376379      else