Changeset 20117

Timestamp:

03/05/2012 05:39:26 PM (11 years ago)

Author:

duck_

Message:

Use WP_Rewrite::set_permalink_structure instead of plain update_option() in populate_network(). Fixes #20174.

This has the benefit of calling WP_Rewrite::init() which correctly resets the permalink_structure
property of the $wp_rewrite global so that the rewrite rules generated on the next flush are correct.

File:

• trunk/wp-admin/includes/schema.php (modified) (2 diffs)

trunk/wp-admin/includes/schema.php

@@ -820 +820 @@
  */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
-    global $wpdb, $current_site, $wp_db_version;
+    global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
     $errors = new WP_Error();
@@ -937 +937 @@
 
     if ( $subdomain_install )
-        update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
+        $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
     else
-        update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/');
+        $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
 
     flush_rewrite_rules();