From fbf0df6a6b448c72e52c9bb141ce90cd95b9faca Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 15 Jan 2006 16:59:07 +0000
Subject: [PATCH] Suite du depot precedent: le probleme semble ne se poser que
pour les url referencant un repertoire mais sans '/' avant le '?'. On le
rajoute et on a de nouveau des URL absolues pour la plupart des envois en
post
---
ecrire/inc_minipres.php | 2 +-
ecrire/inc_naviguer.php | 2 +-
ecrire/inc_utils.php | 7 ++++---
spip_migre | 3 +--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ecrire/inc_minipres.php b/ecrire/inc_minipres.php
index 07d55c9ba7..f34395c2cc 100644
--- a/ecrire/inc_minipres.php
+++ b/ecrire/inc_minipres.php
@@ -189,7 +189,7 @@ function http_href_img($href, $img, $att, $title='', $style='', $class='', $evt=
function generer_url_post_ecrire($script, $args='', $name='', $ancre='') {
$hidden = "";
- $action = generer_url_ecrire($script, $args, false, true) ;
+ $action = generer_url_ecrire($script, $args);
if ($p = strpos($action, '?'))
foreach(preg_split('/&(amp;)?/',substr($action,$p+1)) as $c) {
$hidden .= "\n<input name='" .
diff --git a/ecrire/inc_naviguer.php b/ecrire/inc_naviguer.php
index f22003aa85..86efef4d92 100644
--- a/ecrire/inc_naviguer.php
+++ b/ecrire/inc_naviguer.php
@@ -258,7 +258,7 @@ if ($id_rubrique>0 AND $GLOBALS['meta']['multi_rubriques'] == 'oui' AND ($GLOBAL
echo debut_block_invisible('languesrubrique');
echo "<div class='verdana2' align='center'>";
- echo menu_langues('changer_lang', $langue_rubrique, '', $langue_parent, generer_url_ecrire("naviguer","action=coloniser&id_rubrique=$id_rubrique", true, true ));
+ echo menu_langues('changer_lang', $langue_rubrique, '', $langue_parent, new Link(generer_url_ecrire("naviguer","action=coloniser&id_rubrique=$id_rubrique")));
echo "</div>\n";
echo fin_block();
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index abdcd1a25d..629ff7618f 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -652,9 +652,10 @@ function generer_url_ecrire($script, $args="", $no_entities=false, $rel=false) {
$site .= ((substr($site,-1) <> '/') ? '/' : '') . _DIR_RESTREINT_ABS;
else $site = _DIR_RESTREINT;
- if (substr($site,-1) == '/') {
- $site = substr($site, 0, -1);
- $script = '/' . $script;
+ if (!$site)
+ $site = './';
+ elseif (substr($site,-1) != '/') {
+ $site .= '/';
}
$ext=(ereg('.php[3]?$', $script) ? '' :_EXTENSION_PHP).($args ? "?" : "");
diff --git a/spip_migre b/spip_migre
index afaa595971..cadbd604ae 100755
--- a/spip_migre
+++ b/spip_migre
@@ -56,8 +56,7 @@ done
# Et maintenant, changer la definition de la fonction pivot
# et eliminer les sequelles de - en _
-grep -v "script = '/'" inc_utils.php |
-grep -v "= include_rustine" |
+grep -v "= include_rustine" inc_utils.php |
sed 's/$ext=.*"\?/$args = "?exec=$script" . ($args ? "\&$args/; s,$script$ext,,; s/f = str_replace.*$/f = $nom;/' > x
mv x inc_utils.php
--
GitLab