From b6ad4dfe23ae4104a7f5b075667c4fe2bc68d645 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sun, 12 Aug 2007 10:47:03 +0000
Subject: [PATCH] "integration de #778 (test a venir des que la zone
 refonctionne)"

---
 ecrire/inc/utils.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 8cc4387cba..d0fb47b028 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -335,14 +335,16 @@ function parametre_url($url, $c, $v=NULL, $sep='&amp;') {
 	if (!$a) $a= './';
 
 	// ajout de la globale ?
-	if ($v === NULL)
-		$v = _request($c);
+	//if ($v === NULL)
+	//	$v = _request($c);
 
 	// lire les variables et agir
 	foreach ($url as $n => $val) {
-		if (preg_match(',^'.preg_quote($c,',').'(=.*)?$,', urldecode($val))) {
-			// suppression
-			if (!$v) {
+		if (preg_match(',^'.preg_quote($c,',').'(=.*)?$,', urldecode($val), $r)) {
+			if ($v === NULL) {
+				return $r[1]?substr($r[1],1):''; 
+			}
+			elseif (!$v) {// suppression
 				unset($url[$n]);
 			} else {
 				$url[$n] = $c.'='.rawurlencode($v);
@@ -352,7 +354,9 @@ function parametre_url($url, $c, $v=NULL, $sep='&amp;') {
 	}
 
 	// ajouter notre parametre si on ne l'a pas encore trouve
-	if ($v)
+	if ($v === NULL)
+		return $v;
+	elseif ($v)
 		$url[] = $c.'='.rawurlencode($v);
 
 	// eliminer les vides
-- 
GitLab