mirror of
https://github.com/WordPress/WordPress.git
synced 2024-10-01 00:27:38 +02:00
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:
parent
a1c575b671
commit
aee5f09ca2
@ -398,12 +398,12 @@ final class WP_Theme implements ArrayAccess {
|
|||||||
case 'Template Files' :
|
case 'Template Files' :
|
||||||
$files = $this->get_files( 'php' );
|
$files = $this->get_files( 'php' );
|
||||||
if ( $this->parent() )
|
if ( $this->parent() )
|
||||||
$files = array_merge( $files, $this->parent()->get_files( 'php' ) );
|
$files = array_merge( $this->parent()->get_files( 'php' ), $files );
|
||||||
return $files;
|
return $files;
|
||||||
case 'Stylesheet Files' :
|
case 'Stylesheet Files' :
|
||||||
$files = $this->get_files( 'css' );
|
$files = $this->get_files( 'css' );
|
||||||
if ( $this->parent() )
|
if ( $this->parent() )
|
||||||
$files = array_merge( $files, $this->parent()->get_files( 'css' ) );
|
$files = array_merge( $this->parent()->get_files( 'css' ), $files );
|
||||||
return $files;
|
return $files;
|
||||||
case 'Template Dir' :
|
case 'Template Dir' :
|
||||||
return $this->get_template_directory();
|
return $this->get_template_directory();
|
||||||
|
Loading…
Reference in New Issue
Block a user