Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3265362 by quietone, dww, murilohp: Do not display obsolete themes at admin/appearance 

(cherry picked from commit d7a82b5b1a)
merge-requests/2535/head
catch 2022-02-24 10:45:53 +00:00
parent 1d7fd63519
commit f200a37dd2
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/lib/Drupal/Core/Extension/Extension.php
View File

@ -209,4 +209,17 @@ class Extension {
&& $this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::EXPERIMENTAL);
}
/**
* Checks if an extension is marked as obsolete.
*
* @return bool
* TRUE if an extension is marked as obsolete, FALSE otherwise.
*/
public function isObsolete(): bool {
// This function checks for 'lifecycle: obsolete' to determine if an
// extension is marked as obsolete.
return (isset($this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER])
&& $this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::OBSOLETE);
}
}

7
core/modules/system/src/Controller/SystemController.php
View File

@ -195,7 +195,7 @@ class SystemController extends ControllerBase {
}
/**
* Returns a theme listing.
* Returns a theme listing which excludes obsolete themes.
*
* @return string
* An HTML string of the theme listing page.
@ -206,6 +206,11 @@ class SystemController extends ControllerBase {
$config = $this->config('system.theme');
// Get all available themes.
$themes = $this->themeHandler->rebuildThemeData();
// Remove obsolete themes.
$themes = array_filter($themes, function ($theme) {
return !$theme->isObsolete();
});
uasort($themes, [ThemeExtensionList::class, 'sortByName']);
$theme_default = $config->get('default');

4
core/modules/system/tests/src/Functional/System/ThemeTest.php
View File

@ -320,6 +320,10 @@ class ThemeTest extends BrowserTestBase {
$this->drupalGet('admin/appearance');
$this->submitForm($edit, 'Save configuration');
// Check that obsolete themes are not displayed.
$this->drupalGet('admin/appearance');
$this->assertSession()->pageTextNotContains('Obsolete test theme');
// Check that the administration theme is used on an administration page.
$this->drupalGet('admin/config');
$this->assertSession()->responseContains('core/themes/seven');

7
core/modules/system/tests/themes/obsolete_theme_test/obsolete_theme_test.info.yml Normal file
View File

@ -0,0 +1,7 @@
name: 'Obsolete theme test'
type: theme
description: 'Obsolete test theme.'
version: VERSION
lifecycle: obsolete
lifecycle_link: 'https://example.com/obsolete'
base theme: false