Changeset 25456 for trunk/src/wp-admin/options-permalink.php

Timestamp:

09/16/2013 08:06:27 PM (12 years ago)

Author:

nacin

Message:

Add nginx detection to the Permalink Settings screen.

Introduces got_url_rewrite() and a corresponding filter, which should now be used in lieu of the got_rewrite filter in got_mod_rewrite().

This does not write or even suggest nginx configuration; rather, it prevents nginx from being considered as either Apache or as an unrecognized server.

props johnbillion.
fixes #25098.

File:

• trunk/src/wp-admin/options-permalink.php (modified) (5 diffs)

trunk/src/wp-admin/options-permalink.php

@@ -76 +76 @@
 
 $prefix = $blog_prefix = '';
-if ( ! got_mod_rewrite() && ! $iis7_permalinks )
+if ( ! got_url_rewrite() )
     $prefix = '/index.php';
 if ( is_multisite() && !is_subdomain_install() && is_main_site() )
@@ -127 +127 @@
     else
         $writable = false;
+} elseif ( $is_nginx ) {
+    $writable = false;
 } else {
     if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') )
@@ -153 +155 @@
         else
             _e('Permalink structure updated.');
+    } elseif ( $is_nginx ) {
+        _e('Permalink structure updated.');
     } else {
         if ( $permalink_structure && ! $usingpi && ! $writable )
@@ -227 +231 @@
 <h3 class="title"><?php _e('Optional'); ?></h3>
 <?php
-$suffix = '';
-if ( ! $is_apache && ! $iis7_permalinks )
-    $suffix = $wp_rewrite->index . '/';
+$suffix = $prefix;
+if ( $suffix )
+    $suffix = ltrim( $suffix, '/' ) . '/';
 ?>
 <p><?php
@@ -270 +274 @@
         <?php endif; ?>
     <?php endif; ?>
-<?php else :
+<?php elseif ( ! $is_nginx ) :
     if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>