diff --git a/ecrire/action/iconifier.php b/ecrire/action/iconifier.php index f4afd3c2b8400e486e1f4117d837138ce3fa2632..b9bcf1e35ddd28b41e4f1083367f10eb431b4ca0 100644 --- a/ecrire/action/iconifier.php +++ b/ecrire/action/iconifier.php @@ -20,7 +20,8 @@ function action_iconifier_dist() include_spip('inc/minipres'); minipres(_T('info_acces_interdit')); } - if ($_SERVER['REQUEST_METHOD'] == 'POST') + $arg = urldecode($arg); + if (!preg_match(',^unlink\s,',$arg)) action_spip_image_ajouter_dist(); else action_spip_image_effacer_dist(); } @@ -28,6 +29,7 @@ function action_iconifier_dist() function action_spip_image_effacer_dist() { global $arg; + $arg = preg_replace(',^unlink\s*,','',urldecode($arg)); if (!strstr($arg, "..")) @unlink(_DIR_LOGOS . $arg); } diff --git a/ecrire/inc/logos.php b/ecrire/inc/logos.php index 5ffc961b36e2c1dfdd420ddc5be504059f0c3270..19e2e1b565d527c28455c29f346b740cc85eaabb 100644 --- a/ecrire/inc/logos.php +++ b/ecrire/inc/logos.php @@ -68,7 +68,7 @@ function decrire_logo($id_objet, $mode, $id, $width, $height, $titre="", $script "<font size='1'>" . $xy . "\n<br />[<a href='" . - generer_action_auteur("iconifier", "$nom.$format", generer_url_ecrire($script, "$id_objet=$id", true)) . + generer_action_auteur("iconifier", "unlink $nom.$format", generer_url_ecrire($script, "$id_objet=$id", true)) . "'>". _T('lien_supprimer') . "</a>]</font>" .