X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/80b7979fccf09a75af3f4c111fa27060ae6dbf85..a9fa37e08fa731c7bd108a175c24876823bc071b:/wp-admin/install-helper.php

diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index c98b28cc..42eb31e3 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -10,26 +10,25 @@
  * 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.
  *
- * <code>
- * check_column('wp_links', 'link_description', 'mediumtext');
- * if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
- *     echo "ok\n";
- *
- * $error_count = 0;
- * $tablename = $wpdb->links;
- * // check the column
- * if (!check_column($wpdb->links, 'link_description', 'varchar(255)')) {
- *     $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
- *     $q = $wpdb->query($ddl);
- * }
- *
- * if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
- *     $res .= $tablename . ' - ok <br />';
- * } else {
- *     $res .= 'There was a problem with ' . $tablename . '<br />';
- *     ++$error_count;
- * }
- * </code>
+ *     check_column( 'wp_links', 'link_description', 'mediumtext' );
+ *     if ( check_column( $wpdb->comments, 'comment_author', 'tinytext' ) ) {
+ *         echo "ok\n";
+ *     }
+ *
+ *     $error_count = 0;
+ *     $tablename = $wpdb->links;
+ *     // Check the column.
+ *     if ( ! check_column($wpdb->links, 'link_description', 'varchar( 255 )' ) ) {
+ *         $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+ *         $q = $wpdb->query( $ddl );
+ *     }
+ *
+ *     if ( check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) {
+ *         $res .= $tablename . ' - ok <br />';
+ *     } else {
+ *         $res .= 'There was a problem with ' . $tablename . '<br />';
+ *         ++$error_count;
+ *     }
  *
  * @package WordPress
  * @subpackage Plugin
@@ -43,9 +42,8 @@ if ( ! function_exists('maybe_create_table') ) :
  * Create database table, if it doesn't already exist.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Database table name.
  * @param string $create_ddl Create database table SQL.
@@ -58,9 +56,10 @@ function maybe_create_table($table_name, $create_ddl) {
 			return true;
 		}
 	}
-	//didn't find it try to create it.
+	// Didn't find it, so try to create it.
 	$wpdb->query($create_ddl);
-	// we cannot directly tell that whether this succeeded!
+
+	// We cannot directly tell that whether this succeeded!
 	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
 		if ($table == $table_name) {
 			return true;
@@ -75,9 +74,8 @@ if ( ! function_exists('maybe_add_column') ) :
  * Add column to database table, if column doesn't already exist in table.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Database table name
  * @param string $column_name Table column name
@@ -92,9 +90,11 @@ function maybe_add_column($table_name, $column_name, $create_ddl) {
 			return true;
 		}
 	}
-	//didn't find it try to create it.
+
+	// Didn't find it, so try to create it.
 	$wpdb->query($create_ddl);
-	// we cannot directly tell that whether this succeeded!
+
+	// We cannot directly tell that whether this succeeded!
 	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
 		if ($column == $column_name) {
 			return true;
@@ -108,9 +108,8 @@ endif;
  * Drop column from database table, if it exists.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Table name
  * @param string $column_name Column name
@@ -121,9 +120,11 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
 	global $wpdb;
 	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
 		if ($column == $column_name) {
-			//found it try to drop it.
+
+			// Found it, so try to drop it.
 			$wpdb->query($drop_ddl);
-			// we cannot directly tell that whether this succeeded!
+
+			// We cannot directly tell that whether this succeeded!
 			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
 				if ($column == $column_name) {
 					return false;
@@ -131,7 +132,7 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
 			}
 		}
 	}
-	// else didn't find it
+	// Else didn't find it.
 	return true;
 }
 
@@ -152,16 +153,16 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  *      Extra
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Table name
- * @param string $col_name Column name
- * @param string $col_type Column type
- * @param bool $is_null Optional. Check is null.
- * @param mixed $key Optional. Key info.
- * @param mixed $default Optional. Default value.
- * @param mixed $extra Optional. Extra value.
+ * @param string $col_name   Column name
+ * @param string $col_type   Column type
+ * @param bool   $is_null    Optional. Check is null.
+ * @param mixed  $key        Optional. Key info.
+ * @param mixed  $default    Optional. Default value.
+ * @param mixed  $extra      Optional. Extra value.
  * @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) {
@@ -172,7 +173,8 @@ function check_column($table_name, $col_name, $col_type, $is_null = null, $key =
 	foreach ($results as $row ) {
 
 		if ($row->Field == $col_name) {
-			// got our column, check the params
+
+			// Got our column, check the params.
 			if (($col_type != null) && ($row->Type != $col_type)) {
 				++$diffs;
 			}