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:
commit
de02cde70c
|
@ -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 = file_exists($path) ? $path : false;
|
|
||||||
} else {
|
|
||||||
$fullPath = stream_resolve_include_path($path);
|
$fullPath = stream_resolve_include_path($path);
|
||||||
}
|
|
||||||
if ($fullPath && $this->isValidPath($fullPath)) {
|
if ($fullPath && $this->isValidPath($fullPath)) {
|
||||||
$pathsToRequire[] = $fullPath;
|
$pathsToRequire[] = $fullPath;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue