WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2012-04-05 20:36:34 +00:00
parent a1c575b671
commit aee5f09ca2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-theme.php
View File

@ -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();