From 198f441a4eee9f5447552ca21b044715d0672cf8 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 23 Jan 2006 21:35:52 +0000
Subject: [PATCH] ne pas reference clean_link quand c'est inutle, et a fortiori
si c'est plus difficile de l'utiliser que de l'ignorer
---
ecrire/inc_naviguer.php | 2 +-
ecrire/inc_sites_edit.php | 6 +++---
ecrire/inc_sites_tous.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc_naviguer.php b/ecrire/inc_naviguer.php
index f9b7aa31ca..626588e228 100644
--- a/ecrire/inc_naviguer.php
+++ b/ecrire/inc_naviguer.php
@@ -388,7 +388,7 @@ if ($relief) {
if ($id_rubrique > 0 AND ($flag_editable OR $GLOBALS['meta']["proposer_sites"]> 0)) {
echo "<div align='$spip_lang_right'>";
- icone(_T('info_sites_referencer'), generer_url_ecrire('sites_edit', "id_rubrique=$id_rubrique&redirect=" . urlencode($clean_link->getUrl())), "site-24.gif", "creer.gif");
+ icone(_T('info_sites_referencer'), generer_url_ecrire('sites_edit', "id_rubrique=$id_rubrique&redirect=" . urlencode(generer_url_ecrire('naviguer', "id_rubrique=$id_rubrique"))), "site-24.gif", "creer.gif");
echo "</div><p>";
}
}
diff --git a/ecrire/inc_sites_edit.php b/ecrire/inc_sites_edit.php
index a04a2ca858..7a90c92749 100644
--- a/ecrire/inc_sites_edit.php
+++ b/ecrire/inc_sites_edit.php
@@ -15,7 +15,7 @@ include_ecrire("inc_presentation");
function sites_edit_dist()
{
- global $champs_extra, $clean_link, $connect_statut, $descriptif, $id_rubrique, $id_secteur, $id_syndic, $new, $nom_site, $syndication, $url_site, $url_syndic;
+ global $champs_extra, $connect_statut, $descriptif, $id_rubrique, $id_secteur, $id_syndic, $new, $nom_site, $syndication, $url_site, $url_syndic;
$query = "SELECT * FROM spip_syndic WHERE id_syndic=" . intval($id_syndic);
$result = spip_query($query);
@@ -75,9 +75,9 @@ if ($new == 'oui'){
"<input type='hidden' name='new' value='oui' />\n",
"<input type='hidden' name='analyser_site' value='oui' />\n",
"<input type='hidden' name='redirect' value='",
- ($clean_link->getUrl()),
+ generer_url_ecrire('sites_edit', "id_rubrique=$id_rubrique&new=oui"),
"' />\n",
- "<font face='Verdana,Arial,Sans,sans-serif' size=2>",
+ "<font face='Verdana,Arial,Sans,sans-serif' size='2'>",
_T('texte_referencement_automatique'),
"</font>",
"\n<div align='right'><input type=\"text\" name=\"url\" class='fondl' value=\"http://\" />\n",
diff --git a/ecrire/inc_sites_tous.php b/ecrire/inc_sites_tous.php
index 6837980cb8..ee926cd4cc 100644
--- a/ecrire/inc_sites_tous.php
+++ b/ecrire/inc_sites_tous.php
@@ -17,7 +17,7 @@ include_ecrire("inc_sites_voir");
function sites_tous_dist()
{
- global $connect_statut, $supp_syndic, $options, $clean_link;
+ global $connect_statut, $supp_syndic, $options;
if ($connect_statut == '0minirezo') {
if ($supp_syndic)
--
GitLab