WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phpdoc fixes for setup-config.php. See #7550 props jacobsantos. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-10-12 17:40:20 +00:00
parent da8f0a17a7
commit 454a1d2b88
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/setup-config.php
View File

@ -15,10 +15,16 @@
* @package WordPress * @package WordPress
*/ */
define('WP_INSTALLING', true); define('WP_INSTALLING', true);
//These three defines are required to allow us to use require_wp_db() to load the database class while being wp-content/db.php aware
/**#@+
* These three defines are required to allow us to use require_wp_db() to load
* the database class while being wp-content/db.php aware.
* @ignore
*/
define('ABSPATH', dirname(dirname(__FILE__)).'/'); define('ABSPATH', dirname(dirname(__FILE__)).'/');
define('WPINC', 'wp-includes'); define('WPINC', 'wp-includes');
define('WP_CONTENT_DIR', ABSPATH . 'wp-content'); define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
/**#@-*/
require_once('../wp-includes/compat.php'); require_once('../wp-includes/compat.php');
require_once('../wp-includes/functions.php'); require_once('../wp-includes/functions.php');
@ -135,10 +141,14 @@ switch($step) {
if (empty($prefix)) $prefix = 'wp_'; if (empty($prefix)) $prefix = 'wp_';
// Test the db connection. // Test the db connection.
/**#@+
* @ignore
*/
define('DB_NAME', $dbname); define('DB_NAME', $dbname);
define('DB_USER', $uname); define('DB_USER', $uname);
define('DB_PASSWORD', $passwrd); define('DB_PASSWORD', $passwrd);
define('DB_HOST', $dbhost); define('DB_HOST', $dbhost);
/**#@-*/
// We'll fail here if the values are no good. // We'll fail here if the values are no good.
require_wp_db(); require_wp_db();