Skip to content
Extraits de code Groupes Projets
Valider bc9cbeac rédigé par mattab's avatar mattab
Parcourir les fichiers

Make sure PleineLune can be uninstalled (thanks to UI tests for finding this regression)

parent 24264bb5
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -42,6 +42,8 @@ class Manager extends Singleton ...@@ -42,6 +42,8 @@ class Manager extends Singleton
const DEFAULT_THEME = "Zeitgeist"; const DEFAULT_THEME = "Zeitgeist";
protected $doLoadAlwaysActivatedPlugins = true; protected $doLoadAlwaysActivatedPlugins = true;
// These are always activated and cannot be deactivated
protected $pluginToAlwaysActivate = array( protected $pluginToAlwaysActivate = array(
'CoreHome', 'CoreHome',
'CoreUpdater', 'CoreUpdater',
...@@ -60,6 +62,7 @@ class Manager extends Singleton ...@@ -60,6 +62,7 @@ class Manager extends Singleton
self::DEFAULT_THEME, self::DEFAULT_THEME,
); );
// Plugins bundled with core package, disabled by default
protected $corePluginsDisabledByDefault = array( protected $corePluginsDisabledByDefault = array(
'DBStats', 'DBStats',
'DevicesDetection', 'DevicesDetection',
...@@ -70,10 +73,10 @@ class Manager extends Singleton ...@@ -70,10 +73,10 @@ class Manager extends Singleton
'ExamplePluginTemplate', 'ExamplePluginTemplate',
); );
// Themes bundled with core package, disabled by default
protected $coreThemesDisabledByDefault = array( protected $coreThemesDisabledByDefault = array(
'ExampleTheme', 'ExampleTheme',
'LeftMenu', 'LeftMenu',
'PleineLune',
'Zeitgeist', 'Zeitgeist',
); );
...@@ -98,9 +101,14 @@ class Manager extends Singleton ...@@ -98,9 +101,14 @@ class Manager extends Singleton
$loadPlugin = $isPluginBundledWithCore || $isPluginOfficiallySupported; $loadPlugin = $isPluginBundledWithCore || $isPluginOfficiallySupported;
// Do not enable other Themes // Do not enable other Themes
$isThemeDisabled = in_array($plugin, $this->coreThemesDisabledByDefault); $disabledThemes = $this->coreThemesDisabledByDefault;
$loadPlugin = $loadPlugin && !$isThemeDisabled;
// PleineLune is officially supported, yet we don't want to enable another theme in tests (we test for Morpheus)
$disabledThemes[] = "PleineLune";
$isThemeDisabled = in_array($plugin, $disabledThemes);
$loadPlugin = $loadPlugin && !$isThemeDisabled;
if($loadPlugin) { if($loadPlugin) {
$toLoad[] = $plugin; $toLoad[] = $plugin;
} }
......
Subproject commit 7a8b8d96d9496c553710e1136473019b955600b3 Subproject commit e901c7300da17b163036ba06ca8e855f00c3f67f
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter