Ticket #22639: 22639.2.diff
File 22639.2.diff, 4.0 KB (added by , 11 years ago) |
---|
-
wp-admin/network.php
310 310 global $wpdb; 311 311 312 312 $hostname = get_clean_basedomain(); 313 $slashed_home = trailingslashit( get_option( 'home' ) ); 313 $home_path = get_home_path(); 314 315 $wp_siteurl_subdir = preg_replace( '#^' . preg_quote( ABSPATH, '#' ) . '#', '', $home_path ); // Will this work on Windows servers? 314 316 $base = parse_url( $slashed_home, PHP_URL_PATH ); 315 $wp_dir_from_root = preg_replace( '#^' . preg_quote( $_SERVER['DOCUMENT_ROOT'], '#' ) . '#', '', ABSPATH );316 $wp_siteurl_subdir = trailingslashit( '/' . preg_replace( '#^' . preg_quote( $base, '#' ) . '#', '', $wp_dir_from_root ) );317 317 $rewrite_base = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : ''; 318 318 319 $location_of_wp_config = ABSPATH; 320 if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) 321 $location_of_wp_config = trailingslashit( dirname( ABSPATH ) ); 322 319 323 // Wildcard DNS message. 320 324 if ( is_wp_error( $errors ) ) 321 325 echo '<div class="error">' . $errors->get_error_message() . '</div>'; … … 349 353 <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3> 350 354 <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p> 351 355 <div class="updated inline"><p><?php 352 if ( file_exists( ABSPATH. '.htaccess' ) )356 if ( file_exists( $home_path . '.htaccess' ) ) 353 357 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' ); 354 elseif ( file_exists( ABSPATH. 'web.config' ) )358 elseif ( file_exists( $home_path . 'web.config' ) ) 355 359 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' ); 356 360 else 357 361 _e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' ); … … 360 364 } 361 365 ?> 362 366 <ol> 363 <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’s all, stop editing! Happy blogging. */</code>:' ), ABSPATH); ?></p>367 <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’s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p> 364 368 <textarea class="code" readonly="readonly" cols="100" rows="6"> 365 369 define('MULTISITE', true); 366 370 define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>); … … 454 458 EOF; 455 459 456 460 ?> 457 <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, replacing other WordPress rules:' ), trailingslashit( str_replace( trailingslashit( $wp_siteurl_subdir ), '', ABSPATH ) )); ?></p>461 <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, replacing other WordPress rules:' ), $home_path ); ?></p> 458 462 <?php 459 463 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) 460 464 echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>'; … … 488 492 EOF; 489 493 490 494 ?> 491 <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH); ?></p>495 <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), $home_path ); ?></p> 492 496 <?php 493 497 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) 494 498 echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';