banquise/pelican-panel-mirror
13
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-11-09 20:19:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

only enable plugin if it previously errored

Browse Source
This commit is contained in:
Boy132 2025-11-06 09:11:57 +01:00
parent b5736e89f4
commit 55677472be
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Plugin.php
View File

@ -190,14 +190,9 @@ class Plugin extends Model implements HasPluginSettings
return '\\' . $this->namespace . '\\' . $this->class; return '\\' . $this->namespace . '\\' . $this->class;
} }
public function shouldLoad(): bool public function shouldLoad(?string $panelId = null): bool
{ {
return !$this->isDisabled() && $this->isInstalled() && !$this->isIncompatible(); return !$this->isDisabled() && $this->isInstalled() && !$this->isIncompatible() && (is_null($panelId) || !$this->panels || in_array($panelId, explode(',', $this->panels)));
}
public function shouldLoadPanel(string $panelId): bool
{
return !$this->isDisabled() && $this->isInstalled() && !$this->isIncompatible() && (!$this->panels || in_array($panelId, explode(',', $this->panels)));
} }
public function canEnable(): bool public function canEnable(): bool

4
app/Services/Helpers/PluginService.php
View File

@ -134,7 +134,7 @@ class PluginService
$plugins = Plugin::query()->orderBy('load_order')->get(); $plugins = Plugin::query()->orderBy('load_order')->get();
foreach ($plugins as $plugin) { foreach ($plugins as $plugin) {
try { try {
if (!$plugin->shouldLoadPanel($panel->getId())) { if (!$plugin->shouldLoad($panel->getId())) {
continue; continue;
} }
@ -146,7 +146,9 @@ class PluginService
$panel->plugin(new $pluginClass()); $panel->plugin(new $pluginClass());
if ($plugin->hasErrored()) {
$this->enablePlugin($plugin); $this->enablePlugin($plugin);
}
} catch (Exception $exception) { } catch (Exception $exception) {
if ($this->isDevModeActive()) { if ($this->isDevModeActive()) {
throw ($exception); throw ($exception);