From b261c980c71112fb74541e4c93901ae12449b0d0 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Thu, 13 Sep 2012 10:50:10 +0000
Subject: [PATCH] Fix autoloader merge conflict
---
lib/base.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index 0da33b4d0f..2b05fd7f9e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -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)) {
--
GitLab