diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/install-helper.php --- a/wp/wp-admin/install-helper.php Mon Jun 08 16:11:51 2015 +0000 +++ b/wp/wp-admin/install-helper.php Tue Jun 09 03:35:32 2015 +0200 @@ -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. * - * - * check_column('wp_links', 'link_description', 'mediumtext'); - * if (check_column($wpdb->comments, 'comment_author', 'tinytext')) - * echo "ok\n"; + * 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); - * } + * $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
'; - * } else { - * $res .= 'There was a problem with ' . $tablename . '
'; - * ++$error_count; - * } - *
+ * if ( check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) { + * $res .= $tablename . ' - ok
'; + * } else { + * $res .= 'There was a problem with ' . $tablename . '
'; + * ++$error_count; + * } * * @package WordPress * @subpackage Plugin @@ -43,9 +42,8 @@ * 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 @@ 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 @@ * 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 @@ 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 @@ * 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 @@ 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 @@ } } } - // else didn't find it + // Else didn't find it. return true; } @@ -152,8 +153,6 @@ * Extra * * @since 1.0.0 - * @package WordPress - * @subpackage Plugin * * @param string $table_name Table name * @param string $col_name Column name @@ -172,7 +171,8 @@ 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; }