mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20821 from owncloud/revert-20792-autoloader-absolute-paths 

Revert "Dont bother with stream_resolve_include_path if the path is already absolute"
This commit is contained in:
Thomas Müller 2015-11-30 08:06:45 +01:00
parent 5a9b892b2e 17ce120736
commit de02cde70c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/autoloader.php
View File

@ -170,11 +170,7 @@ class Autoloader {
// No cache or cache miss // No cache or cache miss
$pathsToRequire = array(); $pathsToRequire = array();
foreach ($this->findClass($class) as $path) { foreach ($this->findClass($class) as $path) {
if ($path[0] === '/') { $fullPath = stream_resolve_include_path($path);
$fullPath = file_exists($path) ? $path : false;
} else {
$fullPath = stream_resolve_include_path($path);
}
if ($fullPath && $this->isValidPath($fullPath)) { if ($fullPath && $this->isValidPath($fullPath)) {
$pathsToRequire[] = $fullPath; $pathsToRequire[] = $fullPath;
} }