From 393f7e40732c2e0908cfee959e7b0abac5ce344a Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 5 Jun 2006 07:43:35 +0000
Subject: [PATCH] =?UTF-8?q?r=C3=A9soud=20:=20je=20teste=20actuellement=20l?=
=?UTF-8?q?a=20SPIP=201.9=20(version=20b2)=20Je=20viens=20de=20constater?=
=?UTF-8?q?=20un=20probl=C3=A8me=20:=20Lorsqu'un=20article=20poss=C3=A8de?=
=?UTF-8?q?=20une=20redirection,=20si=20l'on=20modifie=20cet=20article=20i?=
=?UTF-8?q?l=20perd=20le=20contenu=20du=20champ=20de=20redirection.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(Arnaud a.leroi@cgt.fr)
---
ecrire/exec/articles.php | 6 +++---
ecrire/exec/articles_edit.php | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 103dd480af..cc6ff9d1a8 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -23,8 +23,6 @@ include_spip('inc/documents');
include_spip('inc/forum');
include_spip('base/abstract_sql');
- // 28 paremetres, qui dit mieux ?
- // moi ! elle en avait 61 en premiere approche
function exec_affiche_articles_dist($id_article, $ajout_auteur, $change_accepter_forum, $change_petition, $changer_virtuel, $cherche_auteur, $cherche_mot, $debut, $email_unique, $flag_auteur, $flag_editable, $langue_article, $message, $nom_select, $nouv_auteur, $nouv_mot, $rubrique_article, $site_obli, $site_unique, $supp_auteur, $supp_mot, $texte_petition, $titre_article, $lier_trad, $id_trad_new)
{
@@ -1370,7 +1368,9 @@ function revisions_articles ($id_article, $id_secteur, $id_rubrique, $id_rubriqu
'descriptif' => corriger_caracteres(_request('descriptif')),
'nom_site' => corriger_caracteres(_request('nom_site')),
'url_site' => corriger_caracteres(_request('url_site')),
- 'chapo' => corriger_caracteres(_request('chapo')),
+ 'chapo' => corriger_caracteres(
+ _request('changer_virtuel')?'='._request('virtuel') : _request('chapo')
+ ),
'texte' => corriger_caracteres($texte),
'ps' => corriger_caracteres(_request('ps'))) ;
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index bee8151a69..f881fd7b90 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -57,7 +57,7 @@ function chapo_articles_edit($chapo, $articles_chapeau)
$chapo = "";
}
- if ($connect_statut=="0minirezo" AND $virtuel){
+ if ($virtuel) {
echo "<p><div style='border: 1px dashed #666666; background-color: #f0f0f0; padding: 5px;'>";
echo "<table width=100% cellspacing=0 cellpadding=0 border=0>";
echo "<tr><td valign='top'>";
@@ -68,8 +68,8 @@ function chapo_articles_edit($chapo, $articles_chapeau)
echo "</td>";
echo "<td width=10> </td>";
echo "<td valign='top' width='50%'>";
- if (!$virtuel) $virtuel = "http://";
- echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'>";
+ echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml'
+ style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'>";
echo "<input type='hidden' name='changer_virtuel' value='oui'>";
echo "</td></tr></table>\n";
echo "<font face='Verdana,Arial,Sans,sans-serif' size=2>";
@@ -79,9 +79,9 @@ function chapo_articles_edit($chapo, $articles_chapeau)
}
else {
- echo "<HR>";
+ echo "<hr />";
- if (($articles_chapeau) OR $chapo) {
+ if (($articles_chapeau) OR strlen($chapo)) {
if ($spip_ecran == "large") $rows = 8;
else $rows = 5;
echo "<B>"._T('info_chapeau')."</B>";
--
GitLab