From 70a8322fd3cfab333d7282f0ff21d4b9d793ca68 Mon Sep 17 00:00:00 2001 From: desrosj Date: Thu, 13 Jun 2019 15:34:52 +0000 Subject: [PATCH] =?UTF-8?q?Customize:=20Remove=20=E2=80=9CUpdate=E2=80=9D?= =?UTF-8?q?=20link=20for=20themes=20on=20multisite=20installs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In [38887], installing themes in the Customizer was disabled for multisite installs. However, an update link continues to be displayed when a theme update is available. Clicking the link causes a JavaScript error. This removes that update link because updates cannot actually be performed in the Customizer in this situation. Reviewed by desrosj and azaozz. Merges [45527] to the 5.2 branch. Props desrosj, earnjam, mukesh27, audrasjb, garrett-eclipse. Fixes #46997. Built from https://develop.svn.wordpress.org/branches/5.2@45528 git-svn-id: http://core.svn.wordpress.org/branches/5.2@45339 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../customize/class-wp-customize-theme-control.php | 11 +++++++++-- wp-includes/version.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wp-includes/customize/class-wp-customize-theme-control.php b/wp-includes/customize/class-wp-customize-theme-control.php index c66ba28612..574be00752 100644 --- a/wp-includes/customize/class-wp-customize-theme-control.php +++ b/wp-includes/customize/class-wp-customize-theme-control.php @@ -93,8 +93,15 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {

' . __( 'Update now' ) . '' ); + if ( is_multisite() ) { + _e( 'New version available.' ); + } else { + printf( + /* translators: %s: "Update now" button */ + __( 'New version available. %s' ), + '' + ); + } ?>

diff --git a/wp-includes/version.php b/wp-includes/version.php index 49d0010e52..8904b1518a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2.2-RC1-45523'; +$wp_version = '5.2.2-RC1-45528'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.