php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge event and sidebar update page into one (#383)

Browse Source
This commit is contained in:
onli
2016-03-20 14:40:08 +00:00
parent 2c7f40aa1e
commit 668363eb1b
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/admin/plugins.inc.php
+18
View File
@@ -159,9 +159,27 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
serendipity_plugin_api::hook_event('backend_plugins_fetchlist', $foreignPlugins);
$pluginstack = array_merge((array)$foreignPlugins['pluginstack'], $pluginstack);
$errorstack = array_merge((array)$foreignPlugins['errorstack'], $errorstack);
if ($serendipity['GET']['only_group'] == 'UPGRADE') {
// for upgrades, the distinction in sidebar and event-plugins is not useful. We will fetch both and mix the lists
if ($serendipity['GET']['type'] == 'event') {
$serendipity['GET']['type'] = 'sidebar';
} else {
$serendipity['GET']['type'] = 'event';
}
$foreignPluginsTemp = array();
serendipity_plugin_api::hook_event('backend_plugins_fetchlist', $foreignPluginsTemp);
$pluginstack = array_merge((array)$foreignPluginsTemp['pluginstack'], $pluginstack);
$errorstack = array_merge((array)$foreignPluginsTemp['errorstack'], $errorstack);
$foreignPlugins = array_merge($foreignPlugins, $foreignPluginsTemp);
}
$plugins = serendipity_plugin_api::get_installed_plugins();
$classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] === 'event'));
if ($serendipity['GET']['only_group'] == 'UPGRADE') {
$classes = array_merge($classes, serendipity_plugin_api::enum_plugin_classes(!($serendipity['GET']['type'] === 'event')));
$data['type'] = 'both';
}
usort($classes, 'serendipity_pluginListSort');
$counter = 0;