Merge branch 'hotfix/2.3.1'

pluginsGLPI · Dec 21, 2017 · 6b23e01 · 6b23e01
2 parents c44ced5 + 3ff83d4
commit 6b23e01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/setup.php b/setup.php
@@ -28,7 +28,7 @@
  @since     2009
  ---------------------------------------------------------------------- */
 
-define ('PLUGIN_UNINSTALL_VERSION', '2.3.0');
+define ('PLUGIN_UNINSTALL_VERSION', '2.3.1');
 
 /**
  * Function Init
@@ -51,10 +51,10 @@ function plugin_init_uninstall() {
                                              'Printer'];
 
       if (Session::getLoginUserID()) {
-         if (Session::haveRight(PluginUninstallProfile::$rightname, READ)) {
+         if (Session::haveRight('uninstall:profile', READ)) {
             $PLUGIN_HOOKS['use_massive_action']['uninstall'] = true;
 
-            if (Session::haveRight('uninstall:profile', READ)) {
+            if (Session::haveRight('uninstall:profile', UPDATE)) {
                // Add link in GLPI plugins list :
                $PLUGIN_HOOKS["menu_toadd"]['uninstall'] = ['admin' => 'PluginUninstallModel'];
 

diff --git a/uninstall.xml b/uninstall.xml
@@ -23,6 +23,9 @@
       <author>Remi Collet</author>
    </authors>
    <versions>
+      <version>
+         <num>2.3.1</num>
+         <compatibility>9.2</compatibility>
       <version>
          <num>2.3.0</num>
          <compatibility>9.2</compatibility>