sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Props davilera.
Fixes #40820.


git-svn-id: https://develop.svn.wordpress.org/trunk@41601 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2017-09-26 08:53:20 +00:00
parent 14b593d669
commit b3b2ac2a55
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/class-wp-theme.php
View File

@ -250,6 +250,14 @@ final class WP_Theme implements ArrayAccess {
}
}
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;
}
// (If template is set from cache [and there are no errors], we know it's good.)
if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
$this->template = $this->stylesheet;

4
tests/phpunit/data/themedir1/child-parent-itself/style.css Normal file
View File

@ -0,0 +1,4 @@
/*
Theme Name: Child and Parent Theme
Template: child-parent-itself
*/

10
tests/phpunit/tests/theme/WPTheme.php
View File

@ -140,6 +140,16 @@ class Tests_Theme_WPTheme extends WP_UnitTestCase {
$this->assertFalse( $theme->display( 'Tags' ) );
}
/**
* @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() );
}
/**
* Enable a single theme on a network.

16
tests/phpunit/tests/theme/themeDir.php
View File

@ -175,8 +175,20 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
* @expectedDeprecated get_broken_themes
*/
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() );
}