From 0db135005bf7013ecabf102f2d31cd77f1c9ef04 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 27 Aug 2004 05:20:59 +0000 Subject: [PATCH] Eliminate use of DOCUMENT_ROOT. Look for .htaccess in 'home'. git-svn-id: https://develop.svn.wordpress.org/trunk@1567 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/options-permalink.php | 15 +++++++++++++-- wp-admin/templates.php | 12 ++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index a69490fbf4..5c1eda992f 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -20,6 +20,16 @@ for ($i=0; $i

diff --git a/wp-admin/templates.php b/wp-admin/templates.php index 0a9a69869d..69b3f5f7ca 100644 --- a/wp-admin/templates.php +++ b/wp-admin/templates.php @@ -97,10 +97,14 @@ update_option('recently_edited', array(1, 2, 3) ); } $home = get_settings('home'); - if ($home != '' && ('index.php' == $file || get_settings('blogfilename') == $file)) { - $home_root = str_replace('http://', '', $home); - $home_root = preg_replace('|([^/]*)(.*)|i', '$2', $home_root); - $real_file = $_SERVER['DOCUMENT_ROOT'] . $home_root . '/' . $file; + if (($home != '' && $home != get_settings('siteurl')) && + ('index.php' == $file || get_settings('blogfilename') == $file || + '.htaccess' == $file)) { + $home_root = parse_url($home); + $home_root = $home_root['path']; + $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]); + $home_root = $root . $home_root; + $real_file = $home_root . '/' . $file; } else { $file = validate_file($file); $real_file = '../' . $file;