Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove accidental change to tags 2.3

git-svn-id: http://svn.automattic.com/wordpress/tags/2.3@6197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
commit 85806701cf004cd6289c1dfbef6838d6e25db551 1 parent 7785ead
westi authored
View
5 wp-admin/setup-config.php
@@ -1,8 +1,5 @@
<?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(__FILE__).'/../');
-define('WPINC', 'wp-includes');
require_once('../wp-includes/compat.php');
require_once('../wp-includes/functions.php');
@@ -163,7 +160,7 @@ function display_header(){
define('DB_HOST', $dbhost);
// We'll fail here if the values are no good.
- require_wp_db();
+ require_once('../wp-includes/wp-db.php');
$handle = fopen('../wp-config.php', 'w');
foreach ($configFile as $line_num => $line) {
View
17 wp-includes/functions.php
@@ -1416,21 +1416,4 @@ 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');
-}
-
?>
View
6 wp-settings.php
@@ -117,7 +117,11 @@ function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(
require (ABSPATH . WPINC . '/compat.php');
require (ABSPATH . WPINC . '/functions.php');
-require_wp_db();
+if ( file_exists(ABSPATH . 'wp-content/db.php') )
+ require_once (ABSPATH . 'wp-content/db.php');
+else
+ require_once (ABSPATH . WPINC . '/wp-db.php');
+
// $table_prefix is deprecated as of 2.1
$wpdb->prefix = $table_prefix;
Please sign in to comment.
Something went wrong with that request. Please try again.