sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Andrew Nacin 2012-04-05 20:36:34 +00:00
parent 7ffdb1a514
commit 596c72cafa
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();