Skip to content
Snippets Groups Projects
Commit d7a82b5b authored by catch's avatar catch
Browse files

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

parent 2b1faaac
No related branches found
No related tags found
39 merge requests!12227Issue #3181946 by jonmcl, mglaman,!7471uncessary 5 files are moved from media-library folder to misc folder,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3291Issue #3336463: Rewrite rules for gzipped CSS and JavaScript aggregates never match,!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3102Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use...,!2853#3274419 Makes BaseFieldOverride inherit the internal property from the base field.,!2719Issue #3110137: Remove Classy from core.,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1974Issue #3036862 demonstration,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1254Issue #3238915: Refactor (if feasible) uses of the jQuery ready function to use VanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!873Issue #2875228: Site install not using batch API service,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!712Issue #2909128: Autocomplete intermittent on Chrome Android,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
...@@ -209,4 +209,17 @@ public function isExperimental(): bool { ...@@ -209,4 +209,17 @@ public function isExperimental(): bool {
&& $this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::EXPERIMENTAL); && $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);
}
} }
...@@ -191,7 +191,7 @@ public function systemAdminMenuBlockPage() { ...@@ -191,7 +191,7 @@ public function systemAdminMenuBlockPage() {
} }
/** /**
* Returns a theme listing. * Returns a theme listing which excludes obsolete themes.
* *
* @return string * @return string
* An HTML string of the theme listing page. * An HTML string of the theme listing page.
...@@ -202,6 +202,11 @@ public function themesPage() { ...@@ -202,6 +202,11 @@ public function themesPage() {
$config = $this->config('system.theme'); $config = $this->config('system.theme');
// Get all available themes. // Get all available themes.
$themes = $this->themeHandler->rebuildThemeData(); $themes = $this->themeHandler->rebuildThemeData();
// Remove obsolete themes.
$themes = array_filter($themes, function ($theme) {
return !$theme->isObsolete();
});
uasort($themes, [ThemeExtensionList::class, 'sortByName']); uasort($themes, [ThemeExtensionList::class, 'sortByName']);
$theme_default = $config->get('default'); $theme_default = $config->get('default');
......
...@@ -320,6 +320,10 @@ public function testAdministrationTheme() { ...@@ -320,6 +320,10 @@ public function testAdministrationTheme() {
$this->drupalGet('admin/appearance'); $this->drupalGet('admin/appearance');
$this->submitForm($edit, 'Save configuration'); $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. // Check that the administration theme is used on an administration page.
$this->drupalGet('admin/config'); $this->drupalGet('admin/config');
$this->assertSession()->responseContains('core/themes/seven'); $this->assertSession()->responseContains('core/themes/seven');
......
name: 'Obsolete theme test'
type: theme
description: 'Obsolete test theme.'
version: VERSION
lifecycle: obsolete
lifecycle_link: 'https://example.com/obsolete'
base theme: false
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment