Changeset 41601

Timestamp:

09/26/2017 08:53:20 AM (7 years ago)

Author:

swissspidy

Message:

Themes: Report theme as broken that sets itself as its parent.

Props davilera.
Fixes #40820.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• tests/phpunit/data/themedir1/child-parent-itself (added)
• tests/phpunit/data/themedir1/child-parent-itself/style.css (added)
• tests/phpunit/tests/theme/WPTheme.php (modified) (1 diff)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

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

@@ -249 +249 @@
                     $this->headers['Name'] .= '/' . $this->stylesheet;
             }
+        }
+
+        if ( ! $this->template && $this->stylesheet === $this->headers['Template'] ) {
+            /* translators: %s: Template */
+            $this->errors = new WP_Error( 'theme_child_invalid', sprintf( __( 'The theme defines itself as its parent theme. Please check the "%s" header.' ), 'Template' ) );
+            $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
+
+            return;
         }
 

trunk/tests/phpunit/tests/theme/WPTheme.php

@@ -141 +141 @@
     }
 
+    /**
+     * @ticket 40820
+     */
+    function test_child_theme_with_itself_as_parent_should_appear_as_broken() {
+        $theme = new WP_Theme( 'child-parent-itself', $this->theme_root );
+        $errors = $theme->errors();
+        $this->assertWPError( $errors );
+        $this->assertEquals( 'theme_child_invalid', $errors->get_error_code() );
+    }
+
 
     /**

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -176 +176 @@
      */
     function test_broken_themes() {
-        $themes = get_themes();
-        $expected = array('broken-theme' => array('Name' => 'broken-theme', 'Title' => 'broken-theme', 'Description' => __('Stylesheet is missing.')));
+        $themes   = get_themes();
+
+        $expected = array(
+            'broken-theme'           => array(
+                'Name'        => 'broken-theme',
+                'Title'       => 'broken-theme',
+                'Description' => __( 'Stylesheet is missing.' ),
+            ),
+            'Child and Parent Theme' => array(
+                'Name'        => 'Child and Parent Theme',
+                'Title'       => 'Child and Parent Theme',
+                'Description' => sprintf( __( 'The theme defines itself as its parent theme. Please check the "%s" header.' ), 'Template' ),
+            ),
+        );
 
         $this->assertEquals($expected, get_broken_themes() );