From 0759568db54974d7cbaaa67c408b1eef3afdae23 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 14 Apr 2010 03:48:52 +0000 Subject: [PATCH] MINOR Added brackets around strpos() check just to be sure it works (from r98898) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102814 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Core.php b/core/Core.php index ee2d7ab51..cb5776127 100755 --- a/core/Core.php +++ b/core/Core.php @@ -134,7 +134,7 @@ if(!defined('BASE_URL')) { // If that didn't work, failover to the old syntax. Hopefully this isn't necessary, and maybe // if can be phased out? if(!defined('BASE_URL')) { - $dir = strpos($_SERVER['SCRIPT_NAME'], 'index.php') !== false + $dir = (strpos($_SERVER['SCRIPT_NAME'], 'index.php') !== false) ? dirname($_SERVER['SCRIPT_NAME']) : dirname(dirname($_SERVER['SCRIPT_NAME'])); define('BASE_URL', rtrim($dir, DIRECTORY_SEPARATOR));