Ticket #25702: 25702.2.diff

wp-admin/includes/update-core.php

@@ -589 +589 @@
         'themes/twentyeleven/'   => '3.2',
         'themes/twentytwelve/'   => '3.5',
         'themes/twentythirteen/' => '3.6',
+        'themes/twentyfourteen/' => '3.8',
 );
 
 /**

wp-admin/includes/upgrade.php

@@ -218 +218 @@
         update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
         update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
         update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-        update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array (),'array_version' => 3 ) );
+        update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array (), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array (), 'sidebar-3' => array(), 'array_version' => 3 ) );
 
         if ( ! is_multisite() )
                 update_user_meta( $user_id, 'show_welcome_panel', 1 );

wp-admin/nav-menus.php

@@ -476 +476 @@
 
 if ( ! $locations_screen ) : // Main tab
         $overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
-        $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Thirteen', 'Twenty Twelve' ) . '</p>';
+        $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Fourteen', 'Twenty Thirteen' ) . '</p>';
         $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
         $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
         $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';

wp-includes/class-wp-theme.php

@@ -43 +43 @@
                 'twentyeleven'   => 'Twenty Eleven',
                 'twentytwelve'   => 'Twenty Twelve',
                 'twentythirteen' => 'Twenty Thirteen',
+                'twentyfourteen' => 'Twenty Fourteen',
         );
 
         /**

wp-includes/default-constants.php

@@ -311 +311 @@
          * @since 3.0.0
          */
         if ( !defined('WP_DEFAULT_THEME') )
-                define( 'WP_DEFAULT_THEME', 'twentythirteen' );
+                define( 'WP_DEFAULT_THEME', 'twentyfourteen' );
 
 }