Changeset 22980

Timestamp:

12/03/2012 02:54:29 AM (13 years ago)

Author:

nacin

Message:

Correctly calculate the location of wp-config.php, used in the instructions for setting up a network. see #22639.

File:

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

trunk/wp-admin/network.php

@@ -317 +317 @@
     $rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
 
+    $location_of_wp_config = ABSPATH;
+    if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) )
+        $location_of_wp_config = trailingslashit( dirname( ABSPATH ) );
+
     // Wildcard DNS message.
     if ( is_wp_error( $errors ) )
@@ -361 +365 @@
 ?>
         <ol>
-            <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>
+            <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>:' ), $location_of_wp_config ); ?></p>
                 <textarea class="code" readonly="readonly" cols="100" rows="6">
 define('MULTISITE', true);