From 74c933a5ce2bc4ebaebb5c20754315196271c0f3 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 14 May 2008 08:20:18 +0000
Subject: [PATCH] correction des & plus generale que celle de #URL_LOGOUT
---
ecrire/balise/url_logout.php | 2 +-
ecrire/inc/utils.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ecrire/balise/url_logout.php b/ecrire/balise/url_logout.php
index 9008385599..38f29861f6 100644
--- a/ecrire/balise/url_logout.php
+++ b/ecrire/balise/url_logout.php
@@ -27,6 +27,6 @@ function balise_URL_LOGOUT_dyn($cible) {
if (!$GLOBALS['visiteur_session']['login']) return '';
- return generer_url_action('logout',"logout=public&url=" . rawurlencode($cible ? $cible : self('&')));
+ return generer_url_action('logout',"logout=public&url=" . rawurlencode($cible ? $cible : self('&')));
}
?>
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 20b3d56e2d..0bec221373 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -924,7 +924,7 @@ function generer_url_action($script, $args="", $no_entities=false ,$rel = false)
$url = './';
$url = parametre_url($url,'action',$script);
- if ($args) $url .= '&'.$args;
+ if ($args) $url .= quote_amp('&'.$args);
if ($redirect = parametre_url($url,'redirect')){
if (test_espace_prive()
AND substr($redirect,0,strlen(_DIR_RESTREINT_ABS))==_DIR_RESTREINT_ABS)
--
GitLab