Wordpress 2.6.2

[autoinstalls/wordpress.git] / wp-admin / install-helper.php

diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index d124b1a311a2d92087646f089c29a7b54a06140e..eebe0e3e9d6bdee994f163f6f252cc6e78a37703 100644 (file)
--- 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()