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

Fix autoloader merge conflict

Browse source
This commit is contained in:
Tom Needham 2012-09-13 10:50:10 +00:00
parent 182f890110
commit b261c980c7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/base.php
View file

@ -95,11 +95,13 @@ class OC{
$path = str_replace('_', '/', $className) . '.php';
}
elseif(strpos($className,'Symfony\\')===0){
require_once str_replace('\\','/',$className) . '.php';
$path = str_replace('\\','/',$className) . '.php';
}
elseif(strpos($className,'Test_')===0){
require_once 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
$path = 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
} else {
return false;
}
if($fullPath = stream_resolve_include_path($path)) {