Ticket #14245: blog-now-news.diff

wp-includes/version.php

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

wp-admin/includes/upgrade.php

@@ -152 +152 @@
                                                                 'link_rss' => '',
                                                                 'link_notes' => '');
 
-        $default_links[] = array(       'link_url' => 'http://wordpress.org/development/',
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/news/',
                                                                 'link_name' => 'WordPress Blog',
-                                                                'link_rss' => 'http://wordpress.org/development/feed/',
+                                                                'link_rss' => 'http://wordpress.org/news/feed/',
                                                                 'link_notes' => '');
 
         $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/ideas/',
@@ -440 +440 @@
         if ( $wp_current_db_version < 11958 )
                 upgrade_290();
 
-        if ( $wp_current_db_version < 15260 )
+        if ( $wp_current_db_version < 15381 )
                 upgrade_300();
 
         maybe_disable_automattic_widgets();
@@ -1136 +1136 @@
                                          OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
         }
 
+        if ( $wp_current_db_version < 15381 ) {
+                $wpdb->query( "UPDATE $wpdb->links SET link_name = 'WordPress News' WHERE link_url = 'http://wordpress.org/development/' AND link_name IN ( 'Development Blog', 'WordPress Blog' )" );
+                $wpdb->update( $wpdb->links, array( 'link_url' => 'http://wordpress.org/news/' ), array( 'link_url' => 'http://wordpress.org/development/' ) );
+                $wpdb->update( $wpdb->links, array( 'link_rss' => 'http://wordpress.org/news/feed/' ), array( 'link_rss' => 'http://wordpress.org/development/feed/' ) );
+        }
+
 }
 
 /**

wp-admin/includes/dashboard.php

@@ -67 +67 @@
         if ( !isset( $widget_options['dashboard_primary'] ) ) {
                 $update = true;
                 $widget_options['dashboard_primary'] = array(
-                        'link' => apply_filters( 'dashboard_primary_link',  __( 'http://wordpress.org/development/' ) ),
-                        'url' => apply_filters( 'dashboard_primary_feed',  __( 'http://wordpress.org/development/feed/' ) ),
-                        'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
+                        'link' => apply_filters( 'dashboard_primary_link',  __( 'http://wordpress.org/news/' ) ),
+                        'url' => apply_filters( 'dashboard_primary_feed',  __( 'http://wordpress.org/news/feed/' ) ),
+                        'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress News' ) ),
                         'items' => 2,
                         'show_summary' => 1,
                         'show_author' => 0,