diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3 index 6f48abe30cc34e4cced4fd3390cfc9dc1a92a4ba..fbc5d80cfb55ce80111133aef2c4b5d3128d498b 100644 --- a/ecrire/controle_forum.php3 +++ b/ecrire/controle_forum.php3 @@ -224,29 +224,6 @@ function controle_forum($row, $new) { $controle .= "</FONT>"; $controle .= "</TD></TR></TABLE>"; - // bouton de reponse - switch ($forum_stat) { - case 'prive': - case 'privadm': - case 'privrac': - $url_reponse = 'forum_envoi.php3'; - $titre_reponse = "&titre_message=$forum_titre"; - $retour = '&adresse_retour=controle_forum.php3?page=interne'; - break; - - case 'publie': - default: - $url_reponse = ''; - } - if ($url_reponse) { - $url_reponse .= "?id_parent=$id_forum" . - ($forum_id_rubrique ? "&id_rubrique=$forum_id_rubrique" : - ($forum_id_article ? "&id_article=$forum_id_article" : - ($forum_id_breve ? "&id_rubrique=$forum_id_breve" : ""))) - . $retour . $titre_reponse; - $controle .= "<div align='right' style='font-face: arial,helvetica,sans-serif; font-size: 10;'>[<a href='$url_reponse'>"._L('Répondre')."</a>]</div>"; - } - $controle .= "</TD></TR></TABLE>\n"; if (!($forum_stat == 'off' OR $forum_stat == 'privoff' OR $forum_stat=='prop')) diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3 index 31b8ba3bf7a90c5b2ebb9779ae4515d96f48d5cf..6172d9001572a9b8642572245b1b7e9fd1634a9a 100644 --- a/ecrire/inc_version.php3 +++ b/ecrire/inc_version.php3 @@ -232,7 +232,7 @@ function spip_setcookie ($name='', $value='', $expire=0, $path='', $domain='', $ // patch safari beta 51-60 if (!$path AND eregi("Safari", $GLOBALS['HTTP_USER_AGENT'])) - $path = ereg_replace("/[^/]+", "/", $GLOBALS['REQUEST_URI']); + $path = ereg_replace("/[^/]+$", "/", $GLOBALS['REQUEST_URI']); if ($secure) @setcookie ($name, $value, $expire, $path, $domain, $secure);