golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move database class loading to a shared function to ensure all of WordPress is wp-content/wp-db.php aware. Fixes #5128 props ComputerGuru. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2007-10-06 08:18:33 +00:00
parent e9cfb43133
commit 61f8b8f569
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
<?php
define('WP_INSTALLING', true);
//These two defines are required to allow us to use require_wp_db() to load the database class while being wp-content/wp-db.php aware
define('ABSPATH', dirname(dirname(__FILE__)).'/');
define('WPINC', 'wp-includes');
require_once('../wp-includes/compat.php');
require_once('../wp-includes/functions.php');
@ -160,7 +163,7 @@ switch($step) {
define('DB_HOST', $dbhost);
// We'll fail here if the values are no good.
require_once('../wp-includes/wp-db.php');
require_wp_db();
$handle = fopen('../wp-config.php', 'w');
foreach ($configFile as $line_num => $line) {

17
wp-includes/functions.php
View File

@ -1415,4 +1415,21 @@ function wp_ob_end_flush_all()
while ( @ob_end_flush() );
}
/*
* require_wp_db() - require_once the correct database class file.
*
* This function is used to load the database class file either at runtime or by wp-admin/setup-config.php
* We must globalise $wpdb to ensure that it is defined globally by the inline code in wp-db.php
*
* @global $wpdb
*/
function require_wp_db()
{
global $wpdb;
if ( file_exists(ABSPATH . 'wp-content/db.php') )
require_once (ABSPATH . 'wp-content/db.php');
else
require_once (ABSPATH . WPINC . '/wp-db.php');
}
?>

6
wp-settings.php
View File

@ -121,11 +121,7 @@ if ( !defined('PLUGINDIR') )
require (ABSPATH . WPINC . '/compat.php');
require (ABSPATH . WPINC . '/functions.php');
if ( file_exists(ABSPATH . 'wp-content/db.php') )
require_once (ABSPATH . 'wp-content/db.php');
else
require_once (ABSPATH . WPINC . '/wp-db.php');
require_wp_db();
// $table_prefix is deprecated as of 2.1
$wpdb->prefix = $table_prefix;