From 04792e998a0bcbf32f0501aef9f8e32f01c2f072 Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Wed, 11 Apr 2012 21:03:33 +0200 Subject: [PATCH 1/2] port --- include/functions_installer.inc.php | 9 +++++++++ serendipity_config.inc.php | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php index e147f865..02d40622 100644 --- a/include/functions_installer.inc.php +++ b/include/functions_installer.inc.php @@ -201,6 +201,11 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t $test_path1 = $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/'; } $test_path2 = serendipity_getRealDir(__FILE__); + + if (!empty($_SERVER['ORIG_PATH_TRANSLATED']) && file_exists(dirname($_SERVER['ORIG_PATH_TRANSLATED']) . '/serendipity_admin.php')) { + return realpath(rtrim(dirname($_SERVER['ORIG_PATH_TRANSLATED'], '/'))) . '/'; + } + if (file_exists($test_path1 . 'serendipity_admin.php')) { return $test_path1; } elseif (defined('S9Y_DATA_PATH')) { @@ -1019,6 +1024,10 @@ function serendipity_httpCoreDir() { return dirname($_SERVER['SCRIPT_FILENAME']) . '/'; } + if (!empty($_SERVER['ORIG_PATH_TRANSLATED'])) { + return dirname(realpath($_SERVER['ORIG_PATH_TRANSLATED'])) . '/'; + } + return $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/'; } diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index 9df7bf32..e5441880 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -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! From 66e86ba1cfa9a0487e79806a50d053c30e923bb4 Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Thu, 12 Apr 2012 13:40:17 +0200 Subject: [PATCH 2/2] fix wrong parentheses --- include/functions_installer.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php index 02d40622..d7e55fe7 100644 --- a/include/functions_installer.inc.php +++ b/include/functions_installer.inc.php @@ -203,7 +203,7 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t $test_path2 = serendipity_getRealDir(__FILE__); if (!empty($_SERVER['ORIG_PATH_TRANSLATED']) && file_exists(dirname($_SERVER['ORIG_PATH_TRANSLATED']) . '/serendipity_admin.php')) { - return realpath(rtrim(dirname($_SERVER['ORIG_PATH_TRANSLATED'], '/'))) . '/'; + return realpath(rtrim(dirname($_SERVER['ORIG_PATH_TRANSLATED']), '/')) . '/'; } if (file_exists($test_path1 . 'serendipity_admin.php')) {