From fdc2b341245e0d4288989b6ae3b0992a2bb61ee4 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 9 Jan 2017 14:31:44 +0000 Subject: [PATCH] Docs: Move `install_global_terms()` DocBlock after the `function_exists()` call. Props keesiemeijer. Fixes #39526. Built from https://develop.svn.wordpress.org/trunk@39754 git-svn-id: http://core.svn.wordpress.org/trunk@39692 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 94a122509c..eccf1647c0 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -2860,6 +2860,7 @@ function pre_schema_upgrade() { } } +if ( !function_exists( 'install_global_terms' ) ) : /** * Install global terms. * @@ -2868,7 +2869,6 @@ function pre_schema_upgrade() { * @global wpdb $wpdb * @global string $charset_collate */ -if ( !function_exists( 'install_global_terms' ) ) : function install_global_terms() { global $wpdb, $charset_collate; $ms_queries = " diff --git a/wp-includes/version.php b/wp-includes/version.php index a53a914f04..76b67c9dfd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.8-alpha-39753'; +$wp_version = '4.8-alpha-39754'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.