diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-12-12 09:55:28 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-12-12 09:55:28 +0000 |
| commit | 00b0a955afda1cd16c0fd3452b989fe79e95a20b (patch) | |
| tree | d322fbf0465276c091dfb156345c2b21ca27d155 /app/controllers | |
| parent | 2d0c796aabd52426ca68c037b9148c83856a9fa7 (diff) | |
move sorting to plugin administration and use it in both register actions, fixes #4993
Closes #4993
Merge request studip/studip!3747
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/plugin.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/admin/plugin.php b/app/controllers/admin/plugin.php index bc073a8..1be046d 100644 --- a/app/controllers/admin/plugin.php +++ b/app/controllers/admin/plugin.php @@ -16,7 +16,7 @@ class Admin_PluginController extends AuthenticatedController { - private $plugin_admin; + private PluginAdministration $plugin_admin; /** * Common tasks for all actions. @@ -509,10 +509,7 @@ class Admin_PluginController extends AuthenticatedController public function unregistered_action() { - $plugins = $this->plugin_admin->scanPluginDirectory(); - usort($plugins, function ($a, $b) { - return $a['pluginname'] <=> $b['pluginname']; - }); + $plugins = $this->plugin_admin->scanPluginDirectory(true); $this->unknown_plugins = $plugins; } @@ -525,7 +522,7 @@ class Admin_PluginController extends AuthenticatedController public function register_action($number) { CSRFProtection::verifyUnsafeRequest(); - $unknown_plugins = $this->plugin_admin->scanPluginDirectory(); + $unknown_plugins = $this->plugin_admin->scanPluginDirectory(true); $plugin = $unknown_plugins[$number]; try { |