From ea5bd1ca5ec4bb824d9f8c41db4980f4bd0f02d4 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Thu, 13 Feb 2003 20:49:12 +0000
Subject: [PATCH] =?UTF-8?q?finalement=20le=20"r=C3=A9pondre"=20dans=20le?=
=?UTF-8?q?=20controle-forum=20bof=20bof=20=C3=A0=20l'usage,=20si=20on=20n?=
=?UTF-8?q?e=20l'a=20pas=20dans=20l'espace=20public=20;(?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
par aileurs correction du patch safari (idiot, hein)
---
ecrire/controle_forum.php3 | 23 -----------------------
ecrire/inc_version.php3 | 2 +-
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3
index 6f48abe30c..fbc5d80cfb 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 31b8ba3bf7..6172d90015 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);
--
GitLab