Ticket #38766: 38766.2.diff

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

@@ -1033 +1033 @@
                                 }
 
                                 $types = array( 'page' );
-                                if ( preg_match( '|Template Post Type:(.*)$|mi', file_get_contents( $full_path ), $type ) ) {
+                                if ( preg_match( '|Template Post Type:(.*)\.?\s*$|miU', file_get_contents( $full_path ), $type ) ) {
                                         $types = explode( ',', _cleanup_header_comment( $type[1] ) );
                                 }
 

new file tests/phpunit/data/themedir1/page-templates/38766/no-trailing-period-post-types.php

@@ +1 @@
+<?php
+/*
+   Template Name: No Trailing Period
+   Template Post Type: period, full-stop
+ */

new file tests/phpunit/data/themedir1/page-templates/38766/trailing-period-post-types.php

@@ +1 @@
+<?php
+/*
+   Template Name: Trailing Period.
+   Template Post Type: period, full-stop.
+
+   Text following the meaningful line to the modifier behaves as expected.
+ */

tests/phpunit/tests/admin/includesTheme.php

@@ -87 +87 @@
         }
 
         /**
+         * @ticket 38766
+         */
+        function test_page_templates_for_post_types_with_trailing_periods() {
+                $theme = wp_get_theme( 'page-templates' );
+                $this->assertNotEmpty( $theme );
+
+                switch_theme( $theme['Template'], $theme['Stylesheet'] );
+
+                $this->assertEqualSetsWithIndex( array(
+                        'No Trailing Period' => '38766/no-trailing-period-post-types.php',
+                        'Trailing Period.' => '38766/trailing-period-post-types.php',
+                ), get_page_templates( null, 'period' ) );
+                $this->assertEqualSetsWithIndex( array(
+                        'No Trailing Period' => '38766/no-trailing-period-post-types.php',
+                        'Trailing Period.' => '38766/trailing-period-post-types.php',
+                ), get_page_templates( null, 'full-stop' ) );
+        }
+
+        /**
          * @ticket 38696
          */
         function test_page_templates_child_theme() {