diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index f04cbffa237b412a80a9831dfc47d8d31430bca4..dc6d6a252e58487d5ae82bdd7b15746ba68c06dc 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -778,7 +778,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a if ($afficher_trad) { $texte_img .= http_img_pack("searching.gif", "*", "style='border: 0px; visibility: hidden; float: $spip_lang_right' id = 'img_$div_trad'"); - $texte_img .= "<div style='float: $spip_lang_right;'><a href=\"javascript:charger_id_url('" . generer_url_ecrire("ajax_page", "fonction=sql&id_ajax_fonc=$id_ajax_trad", true). "','$div_trad');\"><img src='". _DIR_IMG_PACK . "langues-12.gif' border='0' /></a></div>"; + $texte_img .= "<div style='float: $spip_lang_right;'><a href=\"javascript:charger_id_url('" . generer_url_ecrire("ajax_page", "fonction=sql&id_ajax_fonc=$id_ajax_trad"). "','$div_trad');\"><img src='". _DIR_IMG_PACK . "langues-12.gif' border='0' /></a></div>"; } bandeau_titre_boite2($texte_img.$titre_table, "article-24.gif"); @@ -961,7 +961,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals $hash = "0x".substr(md5($connect_id_auteur.$jjscript), 0, 16); $tmp_var = substr(md5($jjscript), 0, 4); - $javascript = "charger_id_url('" . generer_url_ecrire("ajax_page", 'fonction=sql&id_ajax_fonc=::id_ajax_fonc::::deb::', true) . "','$tmp_var')"; + $javascript = "charger_id_url('" . generer_url_ecrire("ajax_page", 'fonction=sql&id_ajax_fonc=::id_ajax_fonc::::deb::') . "','$tmp_var')"; $tranches = afficher_tranches_requete($requete, 4, $tmp_var, $javascript); $requete = str_replace("FROM spip_articles AS articles ", "FROM spip_articles AS articles LEFT JOIN spip_petitions AS petitions USING (id_article)", $requete); @@ -988,7 +988,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals $texte_img .= http_img_pack("searching.gif", "*", "style='border: 0px; visibility: hidden; float: $spip_lang_right' id = 'img_$div_trad'"); - $texte_img .= "<div style='float: $spip_lang_right;'><a href=\"javascript:charger_id_url('" . generer_url_ecrire("ajax_page", "fonction=sql&id_ajax_fonc=$id_ajax_trad", true) . "','$div_trad');\"><img src='". _DIR_IMG_PACK . "langues-off-12.gif' border='0' /></a></div>"; + $texte_img .= "<div style='float: $spip_lang_right;'><a href=\"javascript:charger_id_url('" . generer_url_ecrire("ajax_page", "fonction=sql&id_ajax_fonc=$id_ajax_trad") . "','$div_trad');\"><img src='". _DIR_IMG_PACK . "langues-off-12.gif' border='0' /></a></div>"; bandeau_titre_boite2($texte_img.$titre_table, "article-24.gif"); @@ -2325,7 +2325,7 @@ if (true /*$bandeau_colore*/) { // echo "<a href='" . generer_url_ecrire("articles_tous","") . "' class='icone26' onMouseOver=\"changestyle('bandeautoutsite','visibility','visible');\">" . // http_img_pack("tout-site.png", "", "width='26' height='20' border='0'") . "</a>"; - echo "<a href='" . generer_url_ecrire("articles_tous") . "' class='icone26' onMouseOver=\"changestyle('bandeautoutsite','visibility','visible'); charger_id_url_si_vide('" . generer_url_ecrire("ajax_page", "fonction=aff_nav_recherche&id=$id_rubrique", true) . "','nav-recherche');\">", + echo "<a href='" . generer_url_ecrire("articles_tous") . "' class='icone26' onMouseOver=\"changestyle('bandeautoutsite','visibility','visible'); charger_id_url_si_vide('" . generer_url_ecrire("ajax_page", "fonction=aff_nav_recherche&id=$id_rubrique") . "','nav-recherche');\">", http_img_pack("tout-site.png", "", "width='26' height='20' border='0'") . "</a>"; if ($id_rubrique > 0) echo "<a href='" . generer_url_ecrire("brouteur","id_rubrique=$id_rubrique") . "' class='icone26' onMouseOver=\"changestyle('bandeaunavrapide','visibility','visible');\">" . http_img_pack("naviguer-site.png", "", "width='26' height='20' border='0'") ."</a>"; diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 59e9c77860cb4e3b41de426cac13f680bc4899eb..4af2c7c49c71470eca7d661bd5c398675dfccfb1 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -749,10 +749,13 @@ function get_spip_script($default='') { function generer_url_public($script, $args="", $no_entities=false) { // si le script est une action (spip_pass, spip_inscription), - // utiliser generer_url_action [hack temporaire pour faire - // fonctionner #URL_PAGE{spip_pass} ] - if (preg_match(',^spip_(.*),', $script, $regs)) - return generer_url_action($regs[1],$args,true); # attention a la recursivite !! + // standardiser vers la nouvelle API + // [hack temporaire pour faire fonctionner #URL_PAGE{spip_pass} ] + + if (preg_match(',^spip_(.*),', $script, $regs)) { + $args = "action=" . $regs[1] .($args ? "&$args" :''); + $script = ""; + } $action = get_spip_script(); if ($script)