From 209a4c6a86ffe2ac56c41acfd9ae951b551fb0bd Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Tue, 14 Oct 2014 19:57:13 +0000
Subject: [PATCH] Set Twenty Fifteen as the new default theme. see #29799.

git-svn-id: https://develop.svn.wordpress.org/trunk@29895 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-theme.php    | 1 +
 src/wp-includes/default-constants.php | 2 +-
 tests/phpunit/tests/theme.php         | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
index eaf244b78e..49273ca4d9 100644
--- a/src/wp-includes/class-wp-theme.php
+++ b/src/wp-includes/class-wp-theme.php
@@ -44,6 +44,7 @@ final class WP_Theme implements ArrayAccess {
 		'twentytwelve'   => 'Twenty Twelve',
 		'twentythirteen' => 'Twenty Thirteen',
 		'twentyfourteen' => 'Twenty Fourteen',
+		'twentyfifteen'  => 'Twenty Fifteen',
 	);
 
 	/**
diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php
index 334ea71b81..ae97efdd77 100644
--- a/src/wp-includes/default-constants.php
+++ b/src/wp-includes/default-constants.php
@@ -318,6 +318,6 @@ function wp_templating_constants() {
 	 * @since 3.0.0
 	 */
 	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentyfourteen' );
+		define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
 
 }
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index 68222702fa..5dcaee8bac 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -8,7 +8,10 @@
 class Tests_Theme extends WP_UnitTestCase {
 	protected $theme_slug = 'twentyeleven';
 	protected $theme_name = 'Twenty Eleven';
-	protected $default_themes = array( 'twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen', 'twentyfourteen' );
+	protected $default_themes = array(
+		'twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen',
+		'twentyfourteen', 'twentyfifteen',
+	);
 
 	function setUp() {
 		parent::setUp();