From 1d6bd71ce4eda6fd4842754b222a56d45fc3ffa2 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 16 Oct 2019 21:03:02 +0000
Subject: [PATCH] Upgrade/Install: Use a unique error code when an update fails
 due to the PHP JSON extension missing.

This allows update failures caused when the native PHP JSON extension is missing to be distinguished from updates that fail because the site does not meet the minimum PHP requirements.

Follow up of [46455].

Reviewed by desrosj, jorbin, johnbillion.
Fixes #47699.
Built from https://develop.svn.wordpress.org/trunk@46560


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

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 5d37b1901b..e3ddec3db6 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -1004,7 +1004,7 @@ function update_core( $from, $to ) {
 	// Add a warning when the JSON PHP extension is missing.
 	if ( ! extension_loaded( 'json' ) ) {
 		return new WP_Error(
-			'php_not_compatible',
+			'php_not_compatible_json',
 			sprintf(
 				/* translators: 1: WordPress version number, 2: The PHP extension name needed. */
 				__( 'The update cannot be installed because WordPress %1$s requires the %2$s PHP extension.' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1938f95a94..e8965b97a5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-RC1-46559';
+$wp_version = '5.3-RC1-46560';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.