X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..refs/tags/wordpress-2.6.2:/wp-admin/install-helper.php

diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index d124b1a3..eebe0e3e 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -1,5 +1,6 @@
 <?php
-require_once(dirname(dirname(__FILE__)).'/wp-config.php');
+$wp_only_load_config = true;
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 $debug = 0;
 
 /**
@@ -8,6 +9,7 @@ $debug = 0;
  ** Returns:  true if already exists or on successful completion
  **           false on error
  */
+if ( ! function_exists('maybe_create_table') ) :
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
 	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
@@ -25,6 +27,7 @@ function maybe_create_table($table_name, $create_ddl) {
 	}
 	return false;
 }
+endif;
 
 /**
  ** maybe_add_column()
@@ -32,6 +35,7 @@ function maybe_create_table($table_name, $create_ddl) {
  ** Returns:  true if already exists or on successful completion
  **           false on error
  */
+if ( ! function_exists('maybe_add_column') ) :
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb, $debug;
 	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
@@ -50,7 +54,7 @@ function maybe_add_column($table_name, $column_name, $create_ddl) {
 	}
 	return false;
 }
-
+endif;
 
 /**
  ** maybe_drop_column()