Changeset 1567

Timestamp:

08/27/2004 05:20:59 AM (20 years ago)

Author:

rboren

Message:

Eliminate use of DOCUMENT_ROOT. Look for .htaccess in 'home'.

Location:

trunk/wp-admin

Files:

• options-permalink.php (modified) (3 diffs)
• templates.php (modified) (1 diff)

trunk/wp-admin/options-permalink.php

@@ -19 +19 @@
         }
     }
+}
+
+$home = get_settings('home');
+if ($home != '' && $home != get_settings('siteurl')) {
+  $home_path = parse_url($home);
+  $home_path = $home_root['path'];
+  $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]);
+  $home_path = $root . $home_path . "/";
+} else {
+  $home_path = ABSPATH;
 }
 
@@ -48 +58 @@
 <?php if(isset($_POST['rules'])) {
         $rules = explode("\n", $_POST['rules']);
-        if(insert_with_markers(ABSPATH.'.htaccess', 'WordPress', $rules)) {
+        if(insert_with_markers($home_path.'.htaccess', 'WordPress', $rules)) {
 ?>
 <div class="updated" id="htupdate"><p><?php _e('mod_rewrite rules written to .htaccess.'); ?></p></div>
@@ -137 +147 @@
     </p>
 <?php
-if ((! file_exists(ABSPATH.'.htaccess') && is_writable(ABSPATH)) || is_writable(ABSPATH.'.htaccess')) {
+
+if ((! file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) {
 ?>
     <p class="submit"> 

trunk/wp-admin/templates.php

@@ -98 +98 @@
 
     $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);