diff --git a/CHANGELOG.md b/CHANGELOG.md index ab27e6d..750494d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [UNRELEASED] -### Fixed +### Added -- Fix locales encoding +- Add Links for uninstall templates From Item Form ## [2.10.3] - 2025-11-25 diff --git a/inc/uninstall.class.php b/inc/uninstall.class.php index cac884c..d85555e 100644 --- a/inc/uninstall.class.php +++ b/inc/uninstall.class.php @@ -31,7 +31,6 @@ use Glpi\Asset\Asset_PeripheralAsset; use function Safe\preg_grep; - /** * ------------------------------------------------------------------------- * Uninstall plugin for GLPI @@ -60,6 +59,10 @@ * ------------------------------------------------------------------------- */ +use function Safe\json_encode; +use function Safe\ob_end_clean; +use function Safe\ob_start; + class PluginUninstallUninstall extends CommonDBTM { public const PLUGIN_UNINSTALL_TRANSFER_NAME = "plugin_uninstall"; @@ -924,13 +927,13 @@ public static function getInfocomPresentForDevice($type, $ID) * @param $ID * @param $item * @param $user_id - **/ - public static function showFormUninstallation($ID, $item, $user_id) + **/ + public static function showFormUninstallation($ID, $item, $user_id, $templates_id = 0) { /** * @var array $CFG_GLPI */ - global $CFG_GLPI; + global $CFG_GLPI, $DB; $type = $item->getType(); echo "