From 596c72cafae97e2e7bf986d1004c41fad93e63aa Mon Sep 17 00:00:00 2001 From: Andrew Nacin 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: https://develop.svn.wordpress.org/trunk@20374 602fd350-edb4-49c9-b593-d223f7449a82 --- 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 85b4584afc..7c2c5d77e9 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();