diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 427b0acf90..eb794fa025 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -1629,12 +1629,13 @@ function get_the_password_form( $post = 0 ) { * Whether currently in a page template. * * This template tag allows you to determine if you are in a page template. - * You can optionally provide a template name and then the check will be - * specific to that template. + * You can optionally provide a template name or array of template names + * and then the check will be specific to that template. * * @since 2.5.0 + * @since 4.2.0 The `$template` parameter was changed to accept an array of page templates. * - * @param string $template The specific template name if specific matching is required. + * @param string|array $template The specific template name or array of templates to match. * @return bool True on success, false on failure. */ function is_page_template( $template = '' ) { @@ -1649,6 +1650,14 @@ function is_page_template( $template = '' ) { if ( $template == $page_template ) return true; + if ( is_array( $template ) ) { + if ( ( in_array( 'default', $template, true ) && ! $page_template ) + || in_array( $page_template, $template, true ) + ) { + return true; + } + } + if ( 'default' == $template && ! $page_template ) return true; diff --git a/wp-includes/version.php b/wp-includes/version.php index 7e25223918..3c536aa685 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31753'; +$wp_version = '4.2-alpha-31754'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.