Changeset 39168

Timestamp:

11/08/2016 10:40:28 PM (8 years ago)

Author:

swissspidy

Message:

Posts, Post Types: Fix post type templates with child themes.

After [38951] added support for post type templates beyond pages, this fixes an issue where an empty meta box would be shown when using child themes.

Fixes #38696.

Location:

trunk

Files:

• src/wp-admin/edit-form-advanced.php (modified) (1 diff)
• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• tests/phpunit/data/themedir1/page-templates-child (added)
• tests/phpunit/data/themedir1/page-templates-child/style.css (added)
• tests/phpunit/tests/admin/includesTheme.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -260 +260 @@
 }
 
-if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_templates( null, $post_type ) ) > 0 ) {
+if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_templates( $post ) ) > 0 ) {
     add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' );
 }

trunk/src/wp-includes/class-wp-theme.php

@@ -1083 +1083 @@
 
         if ( $this->parent() ) {
-            $post_templates += $this->parent()->get_page_templates( $post );
+            $post_templates += $this->parent()->get_page_templates( $post, $post_type );
         }
 

trunk/tests/phpunit/tests/admin/includesTheme.php

@@ -86 +86 @@
         $this->assertEquals( array(), get_page_templates( null, 'bar' ) );
     }
+
+    /**
+     * @ticket 38696
+     */
+    function test_page_templates_child_theme() {
+        $theme = wp_get_theme( 'page-templates-child' );
+        $this->assertNotEmpty( $theme );
+
+        switch_theme( $theme['Template'], $theme['Stylesheet'] );
+
+        $this->assertEqualSetsWithIndex( array(
+            'Top Level' => 'template-top-level-post-types.php',
+            'Sub Dir'   => 'subdir/template-sub-dir-post-types.php',
+        ), get_page_templates( null, 'foo' ) );
+        $this->assertEqualSetsWithIndex( array(
+            'Top Level' => 'template-top-level-post-types.php',
+            'Sub Dir'   => 'subdir/template-sub-dir-post-types.php',
+        ), get_page_templates( null, 'post' ) );
+        $this->assertEqualSetsWithIndex( array(
+            'Top Level'                           => 'template-top-level.php',
+            'Sub Dir'                             => 'subdir/template-sub-dir.php',
+            'This Template Header Is On One Line' => 'template-header.php',
+        ), get_page_templates() );
+        $this->assertEquals( array(), get_page_templates( null, 'bar' ) );
+    }
 }