From e4ecc7e5c44765f6677a2ecc7c4160e3dbda16df Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 13 Jul 2015 19:56:24 +0000
Subject: [PATCH] Fix summaries and add missing `@global` descriptions to the
 `upgrade_430_fix_comments()` and `split_all_shared_terms()` functions added
 in 4.3.

See [33020], [32643]. See #32891.

Built from https://develop.svn.wordpress.org/trunk@33212


git-svn-id: http://core.svn.wordpress.org/trunk@33184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php | 16 +++++++++-------
 wp-includes/version.php       |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index f13c458bc9..da1e1ba6e5 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1491,12 +1491,12 @@ function upgrade_400() {
 function upgrade_420() {}
 
 /**
- * Execute changes made in WordPress 4.3.0.
+ * Executes changes made in WordPress 4.3.0.
  *
  * @since 4.3.0
  *
- * @global int   $wp_current_db_version
- * @global wpdb  $wpdb
+ * @global int  $wp_current_db_version Current version.
+ * @global wpdb $wpdb                  WordPress database abstraction object.
  */
 function upgrade_430() {
 	global $wp_current_db_version, $wpdb;
@@ -1527,12 +1527,12 @@ function upgrade_430() {
 }
 
 /**
- * Execute comments changes made in WordPress 4.3.0.
+ * Executes comments changes made in WordPress 4.3.0.
  *
  * @since 4.3.0
  *
- * @global int   $wp_current_db_version
- * @global wpdb  $wpdb
+ * @global int  $wp_current_db_version Current version.
+ * @global wpdb $wpdb                  WordPress database abstraction object.
  */
 function upgrade_430_fix_comments() {
 	global $wp_current_db_version, $wpdb;
@@ -1871,9 +1871,11 @@ function maybe_convert_table_to_utf8mb4( $table ) {
 }
 
 /**
- * Split all shared taxonomy terms.
+ * Splits all shared taxonomy terms.
  *
  * @since 4.3.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function split_all_shared_terms() {
 	global $wpdb;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 31338a0a02..0a0b119e91 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta2-33211';
+$wp_version = '4.3-beta2-33212';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.