Merge pull request silverstripe#189 from simonwelsh/custom-include-path

FEATURE Allow setting of constant CUSTOM_INCLUDE_PATH in _ss_enivronment...

Author: wilr

core/Core.php

@@ -207,10 +207,20 @@ function array_fill_keys($keys,$value) {
 ///////////////////////////////////////////////////////////////////////////////
 // INCLUDES
 
-set_include_path(BASE_PATH . '/sapphire' . PATH_SEPARATOR
-	. BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR
-	. BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR
-	. get_include_path());
+if(defined('CUSTOM_INCLUDE_PATH')) {
+	$includePath = CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
+		. BASE_PATH . '/sapphire' . PATH_SEPARATOR
+		. BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR
+		. BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR
+		. get_include_path();
+} else {
+	$includePath = BASE_PATH . '/sapphire' . PATH_SEPARATOR
+		. BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR
+		. BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR
+		. get_include_path();
+}
+
+set_include_path($includePath);
 
 // Include the files needed the initial manifest building, as well as any files
 // that are needed for the boostrap process on every request.