wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Dont bother with stream_resolve_include_path if the path is already absolute
This commit is contained in:
Thomas Müller 2015-11-27 16:03:39 +01:00
commit 2b316eaa83
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/autoloader.php
View file

@ -170,7 +170,11 @@ 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) {
$fullPath = stream_resolve_include_path($path); if ($path[0] === '/') {
$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;
} }