WordPress.org

Make WordPress Core

Ticket #22090: 22090.3.diff

File 22090.3.diff, 1.5 KB (added by ryan, 2 years ago)

Set permalink structure and flush rules only if not multisite

  • wp-admin/includes/schema.php

     
    926926        } 
    927927        $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert ); 
    928928 
    929         $current_site = new stdClass; 
    930         $current_site->domain = $domain; 
    931         $current_site->path = $path; 
    932         $current_site->site_name = ucfirst( $domain ); 
    933  
    934         if ( !is_multisite() ) { 
     929        if ( ! is_multisite() ) { 
     930                $current_site = new stdClass; 
     931                $current_site->domain = $domain; 
     932                $current_site->path = $path; 
     933                $current_site->site_name = ucfirst( $domain ); 
    935934                $wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) ); 
    936                 $blog_id = $wpdb->insert_id; 
     935                $current_site->blog_id = $blog_id = $wpdb->insert_id; 
    937936                update_user_meta( $site_user->ID, 'source_domain', $domain ); 
    938937                update_user_meta( $site_user->ID, 'primary_blog', $blog_id ); 
    939         } 
    940938 
    941         if ( $subdomain_install ) 
    942                 $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' ); 
    943         else 
    944                 $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' ); 
     939                if ( $subdomain_install ) 
     940                        $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' ); 
     941                else 
     942                        $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' ); 
    945943 
    946         flush_rewrite_rules(); 
     944                flush_rewrite_rules(); 
     945        } 
    947946 
    948947        if ( $subdomain_install ) { 
    949948                $vhost_ok = false;