From 36a4f5437982d1ac7051635db097f801e8e2f131 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 24 Oct 2013 18:21:10 +0000 Subject: [PATCH] Confirm delete_site_option() exists before calling it during an update. This function won't yet exist when updating from 2.7 [sic]. Merges [25893] to the 3.7 branch. fixes #25682. Built from https://develop.svn.wordpress.org/branches/3.7@25894 git-svn-id: http://core.svn.wordpress.org/branches/3.7@25806 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 05b9a3a99d..8c5cd28c7a 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -894,7 +894,8 @@ function update_core($from, $to) { do_action( '_core_updated_successfully', $wp_version ); // Clear the option that blocks auto updates after failures, now that we've been successful. - delete_site_option( 'auto_core_update_failed' ); + if ( function_exists( 'delete_site_option' ) ) + delete_site_option( 'auto_core_update_failed' ); return $wp_version; }