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

Revert "Save remote plugin source when merging remote / local data."

Browse Source 
This reverts commit 8c702769e4.

We can do this better.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein
2020-03-24 15:36:38 +01:00
parent fd6daca381
commit f576501737
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/admin/plugins.inc.php
View File

@ -155,7 +155,6 @@ if (isset($serendipity['GET']['plugin_to_conf'])) {
$data['adminAction'] = 'addnew';
$data['type'] = $serendipity['GET']['type'];
# get plugin data from Spartacus
$foreignPlugins = $pluginstack = $errorstack = array();
serendipity_plugin_api::hook_event('backend_plugins_fetchlist', $foreignPlugins);
$pluginstack = array_merge((array)$foreignPlugins['pluginstack'], $pluginstack);
@ -174,7 +173,6 @@ if (isset($serendipity['GET']['plugin_to_conf'])) {
$foreignPlugins = array_merge($foreignPlugins, $foreignPluginsTemp);
}
# load cached / installed plugin data
$plugins = serendipity_plugin_api::get_installed_plugins();
$classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] === 'event'));
if ($serendipity['GET']['only_group'] == 'UPGRADE') {
@ -239,15 +237,7 @@ if (isset($serendipity['GET']['plugin_to_conf'])) {
$props['local_documentation'] = 'plugins/' . $props['pluginPath'] . '/README';
}
}
# if data for this plugin has been fetched from Spartacus:
# add location ("Spartacus") as source field to cached / installe plugin data
if (array_key_exists($class_data['true_name'], $pluginstack)) {
$props['pluginsource'] = $pluginstack[$class_data['true_name']]['pluginlocation'];
}
# save cached / installed plugin data
# (overwriting data that may have been fetched from Spartacus)
$pluginstack[$class_data['true_name']] = $props;
} else {
// False is returned if a plugin could not be instantiated