diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php index e07b3d8edd..d9aaaba58f 100644 --- a/wp-admin/install-helper.php +++ b/wp-admin/install-helper.php @@ -1,28 +1,30 @@ 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; + * * if ( check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) { * $res .= $tablename . ' - ok
'; * } else { @@ -62,7 +64,7 @@ if ( ! function_exists( 'maybe_create_table' ) ) : // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query. $wpdb->query( $create_ddl ); - // We cannot directly tell that whether this succeeded! + // We cannot directly tell whether this succeeded! foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) { if ( $table === $table_name ) { return true; @@ -100,7 +102,7 @@ if ( ! function_exists( 'maybe_add_column' ) ) : // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query. $wpdb->query( $create_ddl ); - // We cannot directly tell that whether this succeeded! + // We cannot directly tell whether this succeeded! // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names. foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) { if ( $column === $column_name ) { @@ -135,7 +137,7 @@ function maybe_drop_column( $table_name, $column_name, $drop_ddl ) { // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query. $wpdb->query( $drop_ddl ); - // We cannot directly tell that whether this succeeded! + // We cannot directly tell whether this succeeded! // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names. foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) { if ( $column === $column_name ) { @@ -154,16 +156,16 @@ function maybe_drop_column( $table_name, $column_name, $drop_ddl ) { * * Uses the SQL DESC for retrieving the table info for the column. It will help * understand the parameters, if you do more research on what column information - * is returned by the SQL statement. Pass in null to skip checking that - * criteria. + * is returned by the SQL statement. Pass in null to skip checking that criteria. * - * Column names returned from DESC table are case sensitive and are listed: - * Field - * Type - * Null - * Key - * Default - * Extra + * Column names returned from DESC table are case sensitive and are as listed: + * + * - Field + * - Type + * - Null + * - Key + * - Default + * - Extra * * @since 1.0.0 * diff --git a/wp-includes/version.php b/wp-includes/version.php index 1cc063d75a..dab752591f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54858'; +$wp_version = '6.2-alpha-54859'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.