Ticket #25098: 25098.diff

wp-admin/includes/misc.php

@@ -7 +7 @@
  */
 
 /**
- * {@internal Missing Short Description}}
+ * Returns whether or not the server is running Apache with the mod_rewrite module loaded.
  *
  * @since 2.0.0
  *
@@ -19 +19 @@
 }
 
 /**
+ * Returns whether or not the server supports URL rewriting.
+ *
+ * @since 3.7
+ *
+ * @return bool Whether the server supports URL rewriting
+ */
+function got_url_rewrite() {
+    $got_url_rewrite = ( got_mod_rewrite() || is_nginx() || iis7_supports_permalinks() );
+    return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+}
+
+/**
  * {@internal Missing Short Description}}
  *
  * @since 1.5.0

wp-admin/options-permalink.php

@@ -75 +75 @@
 $iis7_permalinks = iis7_supports_permalinks();
 
 $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() )
         $blog_prefix = '/blog';

wp-includes/functions.php

@@ -3036 +3036 @@
 }
 
 /**
+ * Is the server running Nginx?
+ *
+ * @since 3.7
+ * 
+ * @return bool Whether the server is running Nginx
+ */
+function is_nginx() {
+        return $GLOBALS['is_nginx'];
+}
+
+/**
  * Does the specified module exist in the Apache config?
  *
  * @since 2.5.0

wp-includes/vars.php

@@ -87 +87 @@
 $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false);
 
 /**
+ * Whether the server software is Nginx or something else 
+ * @global bool $is_nginx 
+ */ 
+$is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false); 
+ 
+/**
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */