diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 85090cb60dc114fb334c4c7fbb57333d1297b81c..99a1b05260f96b6c741e23a27a23b2cc7f409c64 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -169,7 +169,7 @@ fin_cadre_enfonce(false); // if ($options == 'avancees' AND $GLOBALS['meta']["articles_mots"] != 'non') { - formulaire_mots('articles', $id_article, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("articles","id_article=$id_article")); + formulaire_mots('articles', $id_article, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable); } langues_articles($id_article, $langue_article, $flag_editable, $id_rubrique, $id_trad, $dir_lang, $nom_select, $lier_trad, $id_trad_new); diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php index 3d8db42c558a17041203a1030bcea4aebbd4d575..8aa7d0bf5098e951734941e6b4cc7485a7725382 100644 --- a/ecrire/exec/breves_voir.php +++ b/ecrire/exec/breves_voir.php @@ -124,7 +124,7 @@ if ($flag_editable AND ($options == 'avancees' OR $statut == 'publie')) { if ($GLOBALS['meta']["articles_mots"]!='non' AND $flag_editable AND $options == 'avancees') { - formulaire_mots('breves', $id_breve, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("breves_voir", "id_breve=$id_breve")); + formulaire_mots('breves', $id_breve, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable); } diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php index 52158df1ac28df3feaeb4ba4fca55192b8c88f12..a3fa366be8dc3f7fe3a275d8f0fd30787eb0719b 100644 --- a/ecrire/exec/naviguer.php +++ b/ecrire/exec/naviguer.php @@ -127,7 +127,7 @@ function exec_naviguer_dist() /// Mots-cles if ($GLOBALS['meta']["articles_mots"] != 'non' AND $id_rubrique > 0) { echo "\n<p>"; - formulaire_mots('rubriques', $id_rubrique, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("naviguer","id_rubrique=$id_rubrique&id_parent=$id_parent")); + formulaire_mots('rubriques', $id_rubrique, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable); } diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php index e6d8bd40da31f95fc47f0293131fc6cb81c59a1c..3cd5729a4fd2d3b814a58772aea12396c4163d7f 100644 --- a/ecrire/exec/sites.php +++ b/ecrire/exec/sites.php @@ -44,7 +44,6 @@ function exec_sites_dist() $nouveau_statut, $old_syndic, $oubli, - $redirect, $reload, $resume, $spip_display, @@ -57,7 +56,6 @@ function exec_sites_dist() $id_rubrique = intval($id_parent); // pas toujours present, mais tant pis. $id_syndic = intval($id_syndic); - $redirect_args = ''; // // Creation d'un site // @@ -109,7 +107,6 @@ if ($analyser_site == 'oui' AND $flag_editable) { $syndication = $v[syndic] ? 'oui' : 'non'; $result = spip_query("UPDATE spip_syndic SET nom_site=" . spip_abstract_quote($nom_site) . ", url_site=" . spip_abstract_quote($url) . ", url_syndic=" . spip_abstract_quote($url_syndic) . ", descriptif=" . spip_abstract_quote($descriptif) . ", syndication='$syndication', statut='$statut' WHERE id_syndic=$id_syndic"); if ($syndication == 'oui') syndic_a_jour($id_syndic); - $redirect_args = "id_syndic=$id_syndic"; } } @@ -166,8 +163,6 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) { marquer_indexer('syndic', $id_syndic); } } - - $redirect_args = "id_syndic=$id_syndic" .($reload ? "&reload=$reload" : ''); } @@ -178,10 +173,6 @@ if ($jour AND $flag_administrable) { calculer_rubriques(); } -if ($redirect AND $redirect_args) { - redirige_par_entete(generer_url_ecrire('sites', $redirect_args . "&redirect=$redirect", true)); -} - // Appliquer le choix resume/fulltexte (necessite un reload) if ($flag_editable AND ($resume == 'oui' OR $resume == 'non')) { $old_resume = spip_fetch_array(spip_query("SELECT resume FROM spip_syndic WHERE id_syndic=$id_syndic")); @@ -339,7 +330,7 @@ if ($flag_editable AND ($options == 'avancees' OR $statut == 'publie')) { echo "\n"; if ($flag_editable AND $options == 'avancees') { - formulaire_mots('syndic', $id_syndic, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable,generer_url_ecrire('sites',"id_syndic=$id_syndic")); + formulaire_mots('syndic', $id_syndic, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable); } echo pipeline('affiche_milieu',array('args'=>array('exec'=>'sites','id_syndic'=>$id_syndic),'data'=>'')); diff --git a/ecrire/inc/mots.php b/ecrire/inc/mots.php index 8eba7e99a6cffff41ba3908c797d33bf280b8ce1..d6d27cf3a7fc27335ce693aeb101a631629abc0a 100644 --- a/ecrire/inc/mots.php +++ b/ecrire/inc/mots.php @@ -101,9 +101,7 @@ function mots_ressemblants($mot, $table_mots, $table_ids='') { * specifie, plus le formulaire d'ajout de mot-cle */ -// $retour ne sert plus car deductible des autres - -function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, $retour='') { +function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable) { global $connect_statut, $connect_toutes_rubriques, $options; global $spip_lang_rtl, $spip_lang_right, $spip_lang;