Merge branch 'master' into 6.4-wip

This commit is contained in:
Eric Schultz
2017-03-25 10:23:59 -05:00

View File

@@ -485,6 +485,7 @@ if ($method == "remove") {
if ($installed_plugin_file !== false) {
// remove the symlink
unlink("/var/log/plugins/$plugin");
@unlink("/tmp/plugins/$plugin");
if (plugin("remove", $installed_plugin_file, $error) === false) {
// but if can't remove, restore the symlink
symlink($installed_plugin_file, "/var/log/plugins/$plugin");