Ticket #40702: 40702-transient-rename.2.diff

src/wp-admin/includes/dashboard.php

@@ -981 +981 @@
         }
 
         $locale = get_user_locale();
-        $cache_key = 'dash_' . md5( $widget_id . '_' . $locale );
+        $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
         if ( false !== ( $output = get_transient( $cache_key ) ) ) {
                 echo $output;
                 return true;

src/wp-admin/includes/upgrade.php

@@ -565 +565 @@
         if ( $wp_current_db_version < 37965 )
                 upgrade_460();
 
-        if ( $wp_current_db_version < 40607 ) {
-                upgrade_480();
-        }
-
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
@@ -1737 +1733 @@
 }
 
 /**
- * Executes changes made in WordPress 4.8.0.
- *
- * @ignore
- * @since 4.8.0
- *
- * @global int $wp_current_db_version Current database version.
- */
-function upgrade_480() {
-        global $wp_current_db_version;
-
-        if ( $wp_current_db_version < 40607 ) {
-                // This feature plugin was merged for #40702, so the plugin itself is no longer needed
-                deactivate_plugins( array( 'nearby-wp-events/nearby-wordpress-events.php' ), true );
-
-                // The markup stored in this transient changed for #40702
-                delete_transient( 'dash_' . md5( 'dashboard_primary' . '_' . get_locale() ) );
-        }
-}
-
-/**
  * Executes network-level upgrade routines.
  *
  * @since 3.0.0