mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Moved _ss_environment.php include to very top
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49884 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
20b0a8ef6e
commit
e4d300c8c8
19
main.php
19
main.php
@ -30,6 +30,17 @@
|
|||||||
* @see Director::direct()
|
* @see Director::direct()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Include _ss_environment.php file
|
||||||
|
*/
|
||||||
|
$envFiles = array('../_ss_environment.php', '../../_ss_environment.php', '../../../_ss_environment.php');
|
||||||
|
foreach($envFiles as $envFile) {
|
||||||
|
if(@file_exists($envFile)) {
|
||||||
|
include($envFile);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Include Sapphire's core code
|
* Include Sapphire's core code
|
||||||
*/
|
*/
|
||||||
@ -86,14 +97,6 @@ if(Director::isDev()) {
|
|||||||
|
|
||||||
Session::start();
|
Session::start();
|
||||||
|
|
||||||
$envFiles = array('../_ss_environment.php', '../../_ss_environment.php', '../../../_ss_environment.php');
|
|
||||||
foreach($envFiles as $envFile) {
|
|
||||||
if(@file_exists($envFile)) {
|
|
||||||
include($envFile);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isset($_GET['url'])) {
|
if(isset($_GET['url'])) {
|
||||||
$url = $_GET['url'];
|
$url = $_GET['url'];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user