Changeset 25173 for trunk/src/wp-admin/setup-config.php

Timestamp:

08/29/2013 08:45:17 PM (11 years ago)

Author:

nacin

Message:

Move wp-config-sample.php to the root of develop.svn.

wp-config.php is now created in the root. wp-config-sample.php is properly copied over to the build directory for syncing to core.svn.

Add some ignores.

fixes #25185, see #24976.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/setup-config.php (modified) (2 diffs)

trunk

@@ -1 +1 @@
 wp-config.php
 wp-tests-config.php
+phpunit.xml
 node_modules
 npm-debug.log

@@ -1 +1 @@
 wp-config.php
 wp-tests-config.php
+phpunit.xml
 node_modules
 npm-debug.log

trunk/src/wp-admin/setup-config.php

@@ -63 +63 @@
 wp_magic_quotes();
 
-if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) )
+// Support wp-config-sample.php one level up, for the develop repo.
+if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+    $config_file = file( ABSPATH . 'wp-config-sample.php' );
+elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
+    $config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
+else
     wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
-
-$config_file = file(ABSPATH . 'wp-config-sample.php');
 
 // Check if wp-config.php has been created
@@ -276 +279 @@
 <?php
     else :
-        $handle = fopen(ABSPATH . 'wp-config.php', 'w');
+        // If this file doesn't exist, then we are using the wp-config-sample.php
+        // file one level up, which is for the develop repo.
+        if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+            $path_to_wp_config = ABSPATH . 'wp-config.php';
+        else
+            $path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+
+        $handle = fopen( $path_to_wp_config, 'w' );
         foreach( $config_file as $line ) {
-            fwrite($handle, $line);
-        }
-        fclose($handle);
-        chmod(ABSPATH . 'wp-config.php', 0666);
+            fwrite( $handle, $line );
+        }
+        fclose( $handle );
+        chmod( $path_to_wp_config, 0666 );
         setup_config_display_header();
 ?>

@@ -1 +1 @@
 wp-config.php
 wp-tests-config.php
+phpunit.xml
 node_modules
 npm-debug.log