Ticket #16150: 16150.diff

wp-includes/version.php

@@ -15 +15 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 17056;
+$wp_db_version = 17240;
 
 /**
  * Holds the TinyMCE version

wp-admin/includes/upgrade.php

@@ -451 +451 @@
         if ( $wp_current_db_version < 15260 )
                 upgrade_300();
 
+        if ( $wp_current_db_version < 17240 )
+                upgrade_310();
+
         maybe_disable_automattic_widgets();
 
         update_option( 'db_version', $wp_db_version );
@@ -1147 +1150 @@
 }
 
 /**
+ * Execute changes made in WordPress 3.1.
+ *
+ * @since 3.1.0
+ */
+function upgrade_310() {
+        global $wp_current_db_version;
+        if ( $wp_current_db_version < 17240 ) {
+                foreach ( get_post_format_slugs() as $slug ) {
+                        if ( ! term_exists( 'post-format-' . $slug, 'post_format' ) )
+                                wp_insert_term( 'post-format-' . $slug, 'post_format' );
+                }
+        }
+}
+
+/**
  * Execute network level changes
  *
  * @since 3.0.0