<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25173] trunk: Move wp-config-sample.php to the root of develop.svn.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25173">25173</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-08-29 20:45:17 +0000 (Thu, 29 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/25185">#25185</a>, see <a href="http://core.trac.wordpress.org/ticket/24976">#24976</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpconfigsamplephp">trunk/wp-config-sample.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpconfigsamplephp">trunk/src/wp-config-sample.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
<li><a href="#trunktestsphpunit">trunk/tests/phpunit/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: trunk
</span><span class="cx">===================================================================
</span><del>--- trunk 2013-08-29 19:49:32 UTC (rev 25172)
</del><ins>+++ trunk 2013-08-29 20:45:17 UTC (rev 25173)
</ins><a id="trunk"></a>
<div class="propset"><h4>Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx"> wp-config.php
</span><span class="cx"> wp-tests-config.php
</span><ins>+phpunit.xml
</ins><span class="cx"> node_modules
</span><span class="cx"> npm-debug.log
</span><span class="cx"> build
</span><a id="trunkgitignore"></a>
<div class="modfile"><h4>Modified: trunk/.gitignore (25172 => 25173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/.gitignore 2013-08-29 19:49:32 UTC (rev 25172)
+++ trunk/.gitignore 2013-08-29 20:45:17 UTC (rev 25173)
</span><span class="lines">@@ -12,6 +12,8 @@
</span><span class="cx"> results
</span><span class="cx">
</span><span class="cx"> wp-config.php
</span><ins>+wp-tests-config.php
+phpunit.xml
</ins><span class="cx">
</span><span class="cx"> node_modules
</span><span class="cx"> npm-debug.log
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (25172 => 25173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js 2013-08-29 19:49:32 UTC (rev 25172)
+++ trunk/Gruntfile.js 2013-08-29 20:45:17 UTC (rev 25173)
</span><span class="lines">@@ -17,11 +17,19 @@
</span><span class="cx"> },
</span><span class="cx"> copy: {
</span><span class="cx"> all: {
</span><del>- dot: true,
- expand: true,
- cwd: SOURCE_DIR,
- src: ['**','!**/.{svn,git}/**'], // Ignore version control directories.
- dest: BUILD_DIR
</del><ins>+ files: [
+ {
+ dot: true,
+ expand: true,
+ cwd: SOURCE_DIR,
+ src: ['**','!**/.{svn,git}/**'], // Ignore version control directories.
+ dest: BUILD_DIR
+ },
+ {
+ src: 'wp-config-sample.php',
+ dest: BUILD_DIR
+ }
+ ]
</ins><span class="cx"> },
</span><span class="cx"> dynamic: {
</span><span class="cx"> dot: true,
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/setup-config.php (25172 => 25173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/setup-config.php 2013-08-29 19:49:32 UTC (rev 25172)
+++ trunk/src/wp-admin/setup-config.php 2013-08-29 20:45:17 UTC (rev 25173)
</span><span class="lines">@@ -62,11 +62,14 @@
</span><span class="cx"> // Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
</span><span class="cx"> wp_magic_quotes();
</span><span class="cx">
</span><del>-if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) )
</del><ins>+// 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
</ins><span class="cx"> wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
</span><span class="cx">
</span><del>-$config_file = file(ABSPATH . 'wp-config-sample.php');
-
</del><span class="cx"> // Check if wp-config.php has been created
</span><span class="cx"> if ( file_exists( ABSPATH . 'wp-config.php' ) )
</span><span class="cx"> wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );
</span><span class="lines">@@ -275,12 +278,19 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> else :
</span><del>- $handle = fopen(ABSPATH . 'wp-config.php', 'w');
</del><ins>+ // 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' );
</ins><span class="cx"> foreach( $config_file as $line ) {
</span><del>- fwrite($handle, $line);
</del><ins>+ fwrite( $handle, $line );
</ins><span class="cx"> }
</span><del>- fclose($handle);
- chmod(ABSPATH . 'wp-config.php', 0666);
</del><ins>+ fclose( $handle );
+ chmod( $path_to_wp_config, 0666 );
</ins><span class="cx"> setup_config_display_header();
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpconfigsamplephp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-config-sample.php (25172 => 25173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-config-sample.php 2013-08-29 19:49:32 UTC (rev 25172)
+++ trunk/src/wp-config-sample.php 2013-08-29 20:45:17 UTC (rev 25173)
</span><span class="lines">@@ -1,90 +0,0 @@
</span><del>-<?php
-/**
- * The base configurations of the WordPress.
- *
- * This file has the following configurations: MySQL settings, Table Prefix,
- * Secret Keys, WordPress Language, and ABSPATH. You can find more information
- * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
- * wp-config.php} Codex page. You can get the MySQL settings from your web host.
- *
- * This file is used by the wp-config.php creation script during the
- * installation. You don't have to use the web site, you can just copy this file
- * to "wp-config.php" and fill in the values.
- *
- * @package WordPress
- */
-
-// ** MySQL settings - You can get this info from your web host ** //
-/** The name of the database for WordPress */
-define('DB_NAME', 'database_name_here');
-
-/** MySQL database username */
-define('DB_USER', 'username_here');
-
-/** MySQL database password */
-define('DB_PASSWORD', 'password_here');
-
-/** MySQL hostname */
-define('DB_HOST', 'localhost');
-
-/** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
-
-/** The Database Collate type. Don't change this if in doubt. */
-define('DB_COLLATE', '');
-
-/**#@+
- * Authentication Unique Keys and Salts.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
- * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
- *
- * @since 2.6.0
- */
-define('AUTH_KEY', 'put your unique phrase here');
-define('SECURE_AUTH_KEY', 'put your unique phrase here');
-define('LOGGED_IN_KEY', 'put your unique phrase here');
-define('NONCE_KEY', 'put your unique phrase here');
-define('AUTH_SALT', 'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT', 'put your unique phrase here');
-define('NONCE_SALT', 'put your unique phrase here');
-
-/**#@-*/
-
-/**
- * WordPress Database Table prefix.
- *
- * You can have multiple installations in one database if you give each a unique
- * prefix. Only numbers, letters, and underscores please!
- */
-$table_prefix = 'wp_';
-
-/**
- * WordPress Localized Language, defaults to English.
- *
- * Change this to localize WordPress. A corresponding MO file for the chosen
- * language must be installed to wp-content/languages. For example, install
- * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
- * language support.
- */
-define('WPLANG', '');
-
-/**
- * For developers: WordPress debugging mode.
- *
- * Change this to true to enable the display of notices during development.
- * It is strongly recommended that plugin and theme developers use WP_DEBUG
- * in their development environments.
- */
-define('WP_DEBUG', false);
-
-/* That's all, stop editing! Happy blogging. */
-
-/** Absolute path to the WordPress directory. */
-if ( !defined('ABSPATH') )
- define('ABSPATH', dirname(__FILE__) . '/');
-
-/** Sets up WordPress vars and included files. */
-require_once(ABSPATH . 'wp-settings.php');
</del><span class="cx">Index: trunk/tests/phpunit
</span><span class="cx">===================================================================
</span><del>--- trunk/tests/phpunit 2013-08-29 19:49:32 UTC (rev 25172)
</del><ins>+++ trunk/tests/phpunit 2013-08-29 20:45:17 UTC (rev 25173)
</ins></span></pre></div>
<a id="trunktestsphpunit"></a>
<div class="propset"><h4>Property changes: trunk/tests/phpunit</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<ins>+build
+wp-tests-config.php
</ins><a id="trunkwpconfigsamplephpfromrev25164trunksrcwpconfigsamplephp"></a>
<div class="copfile"><h4>Copied: trunk/wp-config-sample.php (from rev 25164, trunk/src/wp-config-sample.php) (0 => 25173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-config-sample.php (rev 0)
+++ trunk/wp-config-sample.php 2013-08-29 20:45:17 UTC (rev 25173)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+<?php
+/**
+ * The base configurations of the WordPress.
+ *
+ * This file has the following configurations: MySQL settings, Table Prefix,
+ * Secret Keys, WordPress Language, and ABSPATH. You can find more information
+ * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
+ * wp-config.php} Codex page. You can get the MySQL settings from your web host.
+ *
+ * This file is used by the wp-config.php creation script during the
+ * installation. You don't have to use the web site, you can just copy this file
+ * to "wp-config.php" and fill in the values.
+ *
+ * @package WordPress
+ */
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define('DB_NAME', 'database_name_here');
+
+/** MySQL database username */
+define('DB_USER', 'username_here');
+
+/** MySQL database password */
+define('DB_PASSWORD', 'password_here');
+
+/** MySQL hostname */
+define('DB_HOST', 'localhost');
+
+/** Database Charset to use in creating database tables. */
+define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+define('DB_COLLATE', '');
+
+/**#@+
+ * Authentication Unique Keys and Salts.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+define('AUTH_KEY', 'put your unique phrase here');
+define('SECURE_AUTH_KEY', 'put your unique phrase here');
+define('LOGGED_IN_KEY', 'put your unique phrase here');
+define('NONCE_KEY', 'put your unique phrase here');
+define('AUTH_SALT', 'put your unique phrase here');
+define('SECURE_AUTH_SALT', 'put your unique phrase here');
+define('LOGGED_IN_SALT', 'put your unique phrase here');
+define('NONCE_SALT', 'put your unique phrase here');
+
+/**#@-*/
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each a unique
+ * prefix. Only numbers, letters, and underscores please!
+ */
+$table_prefix = 'wp_';
+
+/**
+ * WordPress Localized Language, defaults to English.
+ *
+ * Change this to localize WordPress. A corresponding MO file for the chosen
+ * language must be installed to wp-content/languages. For example, install
+ * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
+ * language support.
+ */
+define('WPLANG', '');
+
+/**
+ * For developers: WordPress debugging mode.
+ *
+ * Change this to true to enable the display of notices during development.
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG
+ * in their development environments.
+ */
+define('WP_DEBUG', false);
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+ define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');
</ins></span></pre>
</div>
</div>
</body>
</html>