Changeset 32027 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

04/05/2015 02:48:23 PM (10 years ago)

Author:

SergeyBiryukov

Message:

wp_install_maybe_enable_pretty_permalinks() should have a consistent @return value.

props DrewAPicture.
fixes #6481. see #31888.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (5 diffs)

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

@@ -266 +266 @@
 
 /**
- * Enable pretty permalinks.
+ * Maybe enable pretty permalinks on install.
  *
  * If after enabling pretty permalinks don't work, fallback to query-string permalinks.
@@ -273 +273 @@
  *
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
+ *
+ * @return bool Whether pretty permalinks are enabled. False otherwise.
  */
 function wp_install_maybe_enable_pretty_permalinks() {
@@ -279 +281 @@
     // Bail if a permalink structure is already enabled.
     if ( get_option( 'permalink_structure' ) ) {
-        return;
+        return true;
     }
 
@@ -306 +308 @@
         // Test against a real WordPress Post, or if none were created, a random 404 page.
         $test_url = get_permalink( 1 );
+
         if ( ! $test_url ) {
             $test_url = home_url( '/wordpress-check-for-rewrites/' );
@@ -332 +335 @@
     $wp_rewrite->set_permalink_structure( '' );
     $wp_rewrite->flush_rules( true );
+
+    return false;
 }