Changeset 39236

Timestamp:

11/15/2016 03:36:13 AM (10 years ago)

Author:

peterwilsoncc

Message:

Posts, Post Types: Improve sanitisation of templates' post types.

Prevents post type templates ignoring post types due to invalid characters. Each entry in the Template Post Type comment is run through sanitize_key() to match the sanitisation used by register_post_type().

Fixes #38766.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• tests/phpunit/data/themedir1/page-templates/38766 (added)
• tests/phpunit/data/themedir1/page-templates/38766/no-trailing-period-post-types.php (added)
• tests/phpunit/data/themedir1/page-templates/38766/tilde-post-types.php (added)
• tests/phpunit/data/themedir1/page-templates/38766/trailing-comma-post-types.php (added)
• tests/phpunit/data/themedir1/page-templates/38766/trailing-period-post-types.php (added)
• tests/phpunit/data/themedir1/page-templates/38766/trailing-period-whitespace-post-types.php (added)
• tests/phpunit/data/themedir1/page-templates/38766/trailing-whitespace-period-post-types.php (added)
• tests/phpunit/tests/admin/includesTheme.php (modified) (1 diff)

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

@@ -1039 +1039 @@
 
                                 foreach ( $types as $type ) {
-                                        $type = trim( $type );
+                                        $type = sanitize_key( $type );
                                         if ( ! isset( $post_templates[ $type ] ) ) {
                                                 $post_templates[ $type ] = array();

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

@@ -88 +88 @@
 
         /**
+         * @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',
+                        'Trailing Comma,' => '38766/trailing-comma-post-types.php',
+                        'Trailing Period, White Space.' => '38766/trailing-period-whitespace-post-types.php',
+                        'Trailing White Space, Period.' => '38766/trailing-whitespace-period-post-types.php',
+                        'Tilde in Post Type.' => '38766/tilde-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',
+                        'Trailing Comma,' => '38766/trailing-comma-post-types.php',
+                        'Trailing Period, White Space.' => '38766/trailing-period-whitespace-post-types.php',
+                        'Trailing White Space, Period.' => '38766/trailing-whitespace-period-post-types.php',
+                ), get_page_templates( null, 'full-stop' ) );
+        }
+
+        /**
          * @ticket 38696
          */