Changeset 40803

Timestamp:

05/19/2017 07:13:59 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Dashboard: Change the cache key for dashboard RSS widget; remove the unnecessary database upgrade routine.

Props iandunn, ocean90.
See #40702.

Location:

trunk/src

Files:

• wp-admin/includes/dashboard.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/includes/dashboard.php

@@ -982 +982 @@
 
     $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;
@@ -1064 +1064 @@
         update_option( 'dashboard_widget_options', $widget_options );
         $locale = get_user_locale();
-        $cache_key = 'dash_' . md5( $widget_id . '_' . $locale );
+        $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
         delete_transient( $cache_key );
     }

trunk/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();
@@ -1738 +1734 @@
 
 /**
- * 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.
  *

trunk/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 40607;
+$wp_db_version = 38590;
 
 /**