diff --git a/core/lib/class.plx.admin.php b/core/lib/class.plx.admin.php
index 53ebab8f1..5cbd1f4ba 100644
--- a/core/lib/class.plx.admin.php
+++ b/core/lib/class.plx.admin.php
@@ -290,7 +290,7 @@ public function editUsers($content, $action=false) {
$save = $this->aUsers;
# suppression
- if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idUser'])) {
+ if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idUser']) AND empty($content['update'])) {
foreach($content['idUser'] as $user_id) {
if($content['selection']=='delete' AND $user_id!='001') {
$this->aUsers[$user_id]['delete']=1;
@@ -434,7 +434,7 @@ public function editCategories($content, $action=false) {
$save = $this->aCats;
# suppression
- if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idCategory'])) {
+ if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idCategory']) AND empty($content['update'])) {
foreach($content['idCategory'] as $cat_id) {
unset($this->aCats[$cat_id]);
$action = true;
@@ -567,7 +567,7 @@ public function editStatiques($content, $action=false) {
$save = $this->aStats;
# suppression
- if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idStatic'])) {
+ if(!empty($content['selection']) AND $content['selection']=='delete' AND isset($content['idStatic']) AND empty($content['update'])) {
foreach($content['idStatic'] as $static_id) {
$filename = PLX_ROOT.$this->aConf['racine_statiques'].$static_id.'.'.$this->aStats[$static_id]['url'].'.php';
if(is_file($filename)) unlink($filename);
diff --git a/core/lib/class.plx.plugins.php b/core/lib/class.plx.plugins.php
index 510d619c6..1e2c80476 100644
--- a/core/lib/class.plx.plugins.php
+++ b/core/lib/class.plx.plugins.php
@@ -73,7 +73,7 @@ public function loadPlugins() {
# Si le plugin a une méthode pour des actions de mises à jour
if(method_exists($instance, 'onUpdate')) {
if(is_file(PLX_PLUGINS.$name.'/update')) {
- # on supprime le fichier update pour eviter d'appeler la methode onUpdate
+ # on supprime le fichier update pour eviter d'appeler la methode onUpdate
# à chaque chargement du plugin
unlink(PLX_PLUGINS.$name.'/update');
$updAction = $instance->onUpdate();
@@ -160,7 +160,7 @@ public function getInactivePlugins() {
public function saveConfig($content) {
# activation des plugins
- if(isset($content['selection']) AND $content['selection']=='activate') {
+ if(isset($content['selection']) AND $content['selection']=='activate' AND empty($content['update'])) {
foreach($content['chkAction'] as $idx => $plugName) {
if($plugInstance = $this->getInstance($plugName)) {
if(method_exists($plugName, 'OnActivate'))
@@ -170,7 +170,7 @@ public function saveConfig($content) {
}
}
# désactivation des plugins
- elseif(isset($content['selection']) AND $content['selection']=='deactivate') {
+ elseif(isset($content['selection']) AND $content['selection']=='deactivate' AND empty($content['update'])) {
foreach($content['chkAction'] as $idx => $plugName) {
if($plugInstance = $this->aPlugins[$plugName]) {
if(method_exists($plugName, 'OnDeActivate'))
@@ -180,7 +180,7 @@ public function saveConfig($content) {
}
}
# suppression des plugins
- elseif(isset($content['selection']) AND $content['selection']=='delete') {
+ elseif(isset($content['selection']) AND $content['selection']=='delete' AND empty($content['update'])) {
foreach($content['chkAction'] as $idx => $plugName) {
if($this->deleteDir(realpath(PLX_PLUGINS.$plugName))) {
# suppression fichier de config du plugin
@@ -630,7 +630,7 @@ public function addHook($hookname, $userfunction) {
public function REL_PATH() {
return PLX_PLUGINS.get_class($this).'/';
}
-
+
/**
* Méthode qui retourne le chemin absolu du dossier du plugin
*
diff --git a/readme/CHANGELOG b/readme/CHANGELOG
index 16c728ee9..4a845522b 100644
--- a/readme/CHANGELOG
+++ b/readme/CHANGELOG
@@ -45,6 +45,7 @@ BUG #189: plxAdmin:modCommentaire - mauvais message affiché après la validatio
BUG #190: Warning sur l'utilisation de mktime (paramètre de type string au lieu de integer)
BUG #192: Rédaction d'un article: ajout rapide de tag avec une apostrophe impossible (erreur javascript)
BUG #205: Pas de réécriture d'url pour les liens commençant uniquement par une ancre
+BUG #208: Suppression sans confirmation des pages statiques, catégories, utilisateurs, médias
## PLUXML 5.5 (sortie : 01/04/2016) ##