WordPress.org

Make WordPress Core

Changeset 20374


Ignore:
Timestamp:
04/05/2012 08:36:34 PM (10 years ago)
Author:
nacin
Message:

Child theme files need to override parent theme files. The array_merge() arguments are swapped. see #20103.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp-theme.php

    r20328 r20374  
    399399                $files = $this->get_files( 'php' );
    400400                if ( $this->parent() )
    401                     $files = array_merge( $files, $this->parent()->get_files( 'php' ) );
     401                    $files = array_merge( $this->parent()->get_files( 'php' ), $files );
    402402                return $files;
    403403            case 'Stylesheet Files' :
    404404                $files = $this->get_files( 'css' );
    405405                if ( $this->parent() )
    406                     $files = array_merge( $files, $this->parent()->get_files( 'css' ) );
     406                    $files = array_merge( $this->parent()->get_files( 'css' ), $files );
    407407                return $files;
    408408            case 'Template Dir' :
Note: See TracChangeset for help on using the changeset viewer.