X-Git-Url: http://git.cyclocoop.org/?p=ptitvelo%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Fbalise%2Furl_.php;fp=www%2Fecrire%2Fbalise%2Furl_.php;h=9f345e19c5699b7dc760c29ffbf823c08edeebd0;hp=1533b1ae097f413c4275f04e6c6cb84c19cfb754;hb=b97874b04ea8ca43d21b7ef7309feff8ef0e4a07;hpb=92c7d7f7bccb9629bb7c81b9582b56b61c3f8ec9

diff --git a/www/ecrire/balise/url_.php b/www/ecrire/balise/url_.php
index 1533b1a..9f345e1 100644
--- a/www/ecrire/balise/url_.php
+++ b/www/ecrire/balise/url_.php
@@ -171,18 +171,24 @@ function balise_URL_PAGE_dist($p) {
 
 //
 // #URL_ECRIRE{rubriques} -> ecrire/?exec=rubriques
-//
+// #URL_ECRIRE*  meme chose, mais sans convertir les & en &
 // http://doc.spip.org/@balise_URL_ECRIRE_dist
 function balise_URL_ECRIRE_dist($p) {
 
 	$code = interprete_argument_balise(1,$p);
-	if (!$code)
+	if (!$code) {
 		$fonc = "''";
-	else{
+	}
+	else {
 		$fonc = $code;
 		$args = interprete_argument_balise(2,$p);
-		if ($args != "''" && $args!==NULL)
-			$fonc .= ',' . $args;
+		if ($args === NULL) {
+			$args = "''";
+		}
+		$noentities = $p->etoile ? ", true" : '';
+		if (($args != "''")  OR $noentities) {
+			$fonc .= ",$args$noentities";
+		}
 	}
 	$p->code = 'generer_url_ecrire(' . $fonc .')';
 	$p->interdire_scripts = false;
@@ -201,8 +207,11 @@ function balise_URL_ACTION_AUTEUR_dist($p) {
 	if ($args != "''" && $args!==NULL)
 		$p->code .= ",".$args;
 	$redirect = interprete_argument_balise(3,$p);
-	if ($redirect != "''" && $redirect!==NULL)
+	if ($redirect != "''" && $redirect!==NULL) {
+		if ($args == "''" || $args===NULL)
+			$p->code .= ",''";
 		$p->code .= ",".$redirect;
+	}
 
 	$p->code = "generer_action_auteur(" . $p->code . ")";
 	$p->interdire_scripts = false;