Make WordPress Core

Ticket #7550: 7550.r9124.diff

File 7550.r9124.diff, 1.1 KB (added by jacobsantos, 15 years ago)

Fixes for setup-config.php to keep from poisoning the defines in wp-config-sample.php, based off of r9124

  • setup-config.php

     
    1515 * @package WordPress
    1616 */
    1717define('WP_INSTALLING', true);
    18 //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
     18
     19/**#@+
     20 * These three defines are required to allow us to use require_wp_db() to load
     21 * the database class while being wp-content/db.php aware.
     22 * @ignore
     23 */
    1924define('ABSPATH', dirname(dirname(__FILE__)).'/');
    2025define('WPINC', 'wp-includes');
    2126define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
     27/**#@-*/
    2228
    2329require_once('../wp-includes/compat.php');
    2430require_once('../wp-includes/functions.php');
     
    135141        if (empty($prefix)) $prefix = 'wp_';
    136142
    137143        // Test the db connection.
     144        /**#@+
     145         * @ignore
     146         */
    138147        define('DB_NAME', $dbname);
    139148        define('DB_USER', $uname);
    140149        define('DB_PASSWORD', $passwrd);
    141150        define('DB_HOST', $dbhost);
     151        /**#@-*/
    142152
    143153        // We'll fail here if the values are no good.
    144154        require_wp_db();