Changeset 25456 for trunk/src/wp-admin/includes/misc.php

Timestamp:

09/16/2013 08:06:27 PM (13 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/includes/misc.php (modified) (1 diff)

trunk/src/wp-admin/includes/misc.php

@@ -8 +8 @@
 
 /**
- * {@internal Missing Short Description}}
+ * Returns whether the server is running Apache with the mod_rewrite module loaded.
  *
  * @since 2.0.0
  *
- * @return unknown
+ * @return bool
  */
 function got_mod_rewrite() {
     $got_rewrite = apache_mod_loaded('mod_rewrite', true);
+
+    /**
+     * Filter whether Apache and mod_rewrite are present.
+     *
+     * This filter was previously used to force URL rewriting for other servers,
+     * like nginx. Use the got_url_rewrite filter in got_url_rewrite() instead.
+     *
+     * @see got_url_rewrite()
+     *
+     * @since 2.5.0
+     * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
+     */
     return apply_filters('got_rewrite', $got_rewrite);
+}
+
+/**
+ * Returns whether the server supports URL rewriting.
+ *
+ * Detects Apache's mod_rewrite, IIS 7.0+ permalink support, and nginx.
+ *
+ * @since 3.7.0
+ *
+ * @return bool Whether the server supports URL rewriting.
+ */
+function got_url_rewrite() {
+    $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+
+    /**
+     * Filter whether URL rewriting is available.
+     *
+     * @since 3.7.0
+     * @param bool $got_url_rewrite Whether URL rewriting is available.
+     */
+    return apply_filters( 'got_url_rewrite', $got_url_rewrite );
 }