X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..cd3609994b39a094ff7528b93f55631bb213fd7f:/wp-admin/install-helper.php

diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index cddbc26a..c98b28cc 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -10,9 +10,6 @@
  * needing to use these functions a lot, you might experience time outs. If you
  * do, then it is advised to just write the SQL code yourself.
  *
- * You can turn debugging on, by setting $debug to 1 after you include this
- * file.
- *
  * <code>
  * check_column('wp_links', 'link_description', 'mediumtext');
  * if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
@@ -38,31 +35,14 @@
  * @subpackage Plugin
  */
 
-/**
- * @global bool $wp_only_load_config
- * @name $wp_only_load_config
- * @var bool
- * @since unknown
- */
-$wp_only_load_config = true;
-
 /** Load WordPress Bootstrap */
 require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-/**
- * Turn debugging on or off.
- * @global bool|int $debug
- * @name $debug
- * @var bool|int
- * @since unknown
- */
-$debug = 0;
-
 if ( ! function_exists('maybe_create_table') ) :
 /**
  * Create database table, if it doesn't already exist.
  *
- * @since unknown
+ * @since 1.0.0
  * @package WordPress
  * @subpackage Plugin
  * @uses $wpdb
@@ -94,11 +74,10 @@ if ( ! function_exists('maybe_add_column') ) :
 /**
  * Add column to database table, if column doesn't already exist in table.
  *
- * @since unknown
+ * @since 1.0.0
  * @package WordPress
  * @subpackage Plugin
  * @uses $wpdb
- * @uses $debug
  *
  * @param string $table_name Database table name
  * @param string $column_name Table column name
@@ -106,9 +85,8 @@ if ( ! function_exists('maybe_add_column') ) :
  * @return bool False on failure. True, if already exists or was successful.
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-	global $wpdb, $debug;
+	global $wpdb;
 	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($debug) echo("checking $column == $column_name<br />");
 
 		if ($column == $column_name) {
 			return true;
@@ -129,7 +107,7 @@ endif;
 /**
  * Drop column from database table, if it exists.
  *
- * @since unknown
+ * @since 1.0.0
  * @package WordPress
  * @subpackage Plugin
  * @uses $wpdb
@@ -173,7 +151,7 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  *      Default
  *      Extra
  *
- * @since unknown
+ * @since 1.0.0
  * @package WordPress
  * @subpackage Plugin
  *
@@ -187,16 +165,14 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  * @return bool True, if matches. False, if not matching.
  */
 function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
-	global $wpdb, $debug;
+	global $wpdb;
 	$diffs = 0;
 	$results = $wpdb->get_results("DESC $table_name");
 
 	foreach ($results as $row ) {
-		if ($debug > 1) print_r($row);
 
 		if ($row->Field == $col_name) {
 			// got our column, check the params
-			if ($debug) echo ("checking $row->Type against $col_type\n");
 			if (($col_type != null) && ($row->Type != $col_type)) {
 				++$diffs;
 			}
@@ -213,7 +189,6 @@ function check_column($table_name, $col_name, $col_type, $is_null = null, $key =
 				++$diffs;
 			}
 			if ($diffs > 0) {
-				if ($debug) echo ("diffs = $diffs returning false\n");
 				return false;
 			}
 			return true;
@@ -221,5 +196,3 @@ function check_column($table_name, $col_name, $col_type, $is_null = null, $key =
 	}
 	return false;
 }
-
-?>