From aee5f09ca21477b75e947791f2f890fc9fde111c Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 5 Apr 2012 20:36:34 +0000
Subject: [PATCH] Child theme files need to override parent theme files. The
 array_merge() arguments are swapped. see #20103.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 85b4584af..7c2c5d77e 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -398,12 +398,12 @@ final class WP_Theme implements ArrayAccess {
 			case 'Template Files' :
 				$files = $this->get_files( 'php' );
 				if ( $this->parent() )
-					$files = array_merge( $files, $this->parent()->get_files( 'php' ) );
+					$files = array_merge( $this->parent()->get_files( 'php' ), $files );
 				return $files;
 			case 'Stylesheet Files' :
 				$files = $this->get_files( 'css' );
 				if ( $this->parent() )
-					$files = array_merge( $files, $this->parent()->get_files( 'css' ) );
+					$files = array_merge( $this->parent()->get_files( 'css' ), $files );
 				return $files;
 			case 'Template Dir' :
 				return $this->get_template_directory();