From a5fd3cf9853f7da5879e03cec657b437cf1bea1b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 1 Nov 2012 10:10:06 +0100
Subject: [PATCH] BUG Inspect current directory for include_path

This fixes problems where require/include calls rely
on the relative file path, e.g. in i18n.php.

Followup from https://github.com/silverstripe/sapphire/pull/904
---
 core/Core.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/Core.php b/core/Core.php
index 38e44299d..ec24ea678 100644
--- a/core/Core.php
+++ b/core/Core.php
@@ -186,13 +186,13 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
 // INCLUDES
 
 if(defined('CUSTOM_INCLUDE_PATH')) {
-	$includePath = CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
+	$includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
 		. THIRDPARTY_PATH . PATH_SEPARATOR
 		. get_include_path();
 } else {
-	$includePath = FRAMEWORK_PATH . PATH_SEPARATOR
+	$includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
 		. THIRDPARTY_PATH . PATH_SEPARATOR
 		. get_include_path();