WordPress.org

Make WordPress Core

Ticket #11796: 11796.3.diff

File 11796.3.diff, 5.9 KB (added by xibe, 4 years ago)

First try at updated patch.

  • wp-admin/network.php

     
    237237                echo '<div class="error">' . $errors->get_error_message() . '</div>'; 
    238238 
    239239        if ( $_POST ) { 
    240                 $vhost = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install']; 
     240                $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install']; 
    241241        } else { 
    242242                if ( is_multisite() ) { 
    243                         $vhost = is_subdomain_install(); 
     243                        $subdomain_install = is_subdomain_install(); 
    244244?> 
    245245        <div class="updated"><p><strong><?php _e( 'Notice: The Network feature is already enabled.' ); ?></strong> <?php _e( 'The original configuration steps are shown here for reference.' ); ?></p></div> 
    246246<?php   } else { 
    247                         $vhost = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" ); 
     247                        $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" ); 
    248248?> 
    249249        <div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div> 
    250250        <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p> 
     
    265265                        <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), ABSPATH ); ?></p> 
    266266                                <textarea class="code" readonly="readonly" cols="100" rows="7"> 
    267267define( 'MULTISITE', true ); 
    268 define( 'VHOST', '<?php echo $vhost ? 'yes' : 'no'; ?>' ); 
     268define( 'SUBDOMAIN_INSTALL', 'false' );  
    269269$base = '<?php echo $base; ?>'; 
    270270define( 'DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>' ); 
    271271define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' ); 
     
    309309RewriteRule ^index\.php$ - [L] 
    310310 
    311311# uploaded files 
    312 RewriteRule ^' . ( $vhost ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $vhost ? 1 : 2 ) . ' [L]' . "\n"; 
     312RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n"; 
    313313 
    314 if ( ! $vhost ) 
     314if ( ! $subdomain_install ) 
    315315        $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n"; 
    316316 
    317317$htaccess_file .= "\n" . 'RewriteCond %{REQUEST_FILENAME} -f [OR] 
     
    319319RewriteRule ^ - [L]'; 
    320320 
    321321// @todo custom content dir. 
    322 if ( ! $vhost ) 
     322if ( ! $subdomain_install ) 
    323323        $htaccess_file .= "\n" . 'RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] 
    324324RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]'; 
    325325 
     
    327327 
    328328?> 
    329329                        <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p> 
    330                                 <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $vhost ? 11 : 16; ?>"> 
     330                                <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $subdomain_install ? 11 : 16; ?>"> 
    331331<?php echo wp_htmledit_pre( $htaccess_file ); ?> 
    332332</textarea></li> 
    333333                </ol> 
  • wp-includes/ms-default-constants.php

     
    9090         */ 
    9191        if ( !defined( 'WPMU_ACCEL_REDIRECT' ) ) 
    9292                define( 'WPMU_ACCEL_REDIRECT', false ); 
    93 } 
    94 ?> 
     93 
     94        /** 
     95         * Handling the deprecated VHOST constant. 
     96         * @since 3.0.0 
     97         */ 
     98        if ( defined( 'VHOST' ) )  
     99                $vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );  
     100        if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {  
     101                if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {  
     102                        _deprecated_argument( 'define()', '3.0', $vhost_deprecated );  
     103                } else {  
     104                                trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );  
     105                }  
     106        } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {  
     107                define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );  
     108        } elseif ( defined( 'VHOST' ) ) {  
     109                _deprecated_argument( 'define()', '3.0', $vhost_deprecated );  
     110                define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );  
     111        } else {          
     112                define( 'SUBDOMAIN_INSTALL', false );  
     113                define( 'VHOST', 'no' );  
     114        }  
     115?> 
     116 No newline at end of file 
  • wp-includes/ms-load.php

     
    88 * @subpackage Multisite 
    99 */ 
    1010 
     11wp_default_constants( 'subdomain_install' );  
    1112/** 
    1213 * Whether a subdomain configuration is enabled. 
    1314 * 
     
    1617 * @return bool True if subdomain configuration is enabled, false otherwise. 
    1718 */ 
    1819function is_subdomain_install() { 
    19         if ( defined('VHOST') && VHOST == 'yes' ) 
    20                 return true; 
    21  
    22         return false; 
     20        return SUBDOMAIN_INSTALL;  
    2321} 
    2422 
    2523/** 
  • wp-includes/wp-db.php

     
    575575                        foreach ( $this->tables( 'global' ) as $table => $prefixed_table ) 
    576576                                $this->$table = $prefixed_table; 
    577577 
    578                         if ( defined( 'VHOST' ) && empty( $this->blogid ) ) 
     578                        if ( is_multisite() && empty( $this->blogid ) ) 
    579579                                return $old_prefix; 
    580580 
    581581                        $this->prefix = $this->get_blog_prefix();