1
0
This commit is contained in:
Garvin Hicking
2012-04-11 21:03:33 +02:00
parent d8bcff11a7
commit 04792e998a
2 changed files with 12 additions and 1 deletions

View File

@ -240,7 +240,9 @@ if (defined('IN_installer') && IS_installed === false) {
* Make sure that the file included is in the current directory and not any possible
* include path
*/
if (@file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
if (!defined('S9Y_DATA_PATH') && file_exists(dirname(__FILE__) . '/serendipity_config_local.inc.php')) {
$local_config = dirname(__FILE__) . '/serendipity_config_local.inc.php';
} elseif (@file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
$local_config = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php';
} elseif (defined('S9Y_DATA_PATH')) {
// Shared installation!