From 965d766d550ae7fd9c1e16b83990e80584e90b99 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 10 Jan 2007 22:39:37 +0000
Subject: [PATCH] "le lien desinstaller etait casse, et la deinstallation
 desactivait tout"

---
 ecrire/action/desinstaller_plugin.php | 2 +-
 ecrire/exec/admin_plugin.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ecrire/action/desinstaller_plugin.php b/ecrire/action/desinstaller_plugin.php
index be16295cdb..f3a85dfe49 100644
--- a/ecrire/action/desinstaller_plugin.php
+++ b/ecrire/action/desinstaller_plugin.php
@@ -23,7 +23,7 @@ function action_desinstaller_plugin_dist() {
 		$etat = desinstalle_un_plugin($plug_file,$infos['prefix'],$infos['install']);
 		// desactiver si il a bien ete desinstalle
 		if (!$etat)
-			ecrire_plugin_actifs($plug_file,false,'enleve');
+			ecrire_plugin_actifs(array($plug_file),false,'enleve');
 		ecrire_metas();
 	}
 	if ($redirect = _request('redirect')){
diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php
index e468c8074f..9ef1e31fbc 100644
--- a/ecrire/exec/admin_plugin.php
+++ b/ecrire/exec/admin_plugin.php
@@ -289,9 +289,9 @@ function ligne_plug($plug_file, $actif, $id){
 	// bouton de desinstallation
 	if ($actif && plugin_est_installe($plug_file)){
 		$s .= "<div style='float:$spip_lang_right' class='spip_pack'>";
+		$action = generer_action_auteur('desinstaller_plugin',$plug_file,generer_url_ecrire('admin_plugin'));
 		$s .= "<a href='$action'>"._T('bouton_effacer_tout')."</a>";
 		$s .= http_img_pack('spip-pack-24.png','spip-pack','','spip-pack');
-		$action = generer_action_auteur('desinstaller_plugin',$plug_file,generer_url_ecrire('admin_plugin'));
 		$s .= "</div>";
 	}
 
-- 
GitLab