From fa32d85881b11dbb47dbb197848762c97f757587 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 15 Sep 2008 05:31:19 +0000
Subject: [PATCH] =?UTF-8?q?Normaliser=20l'usage=20de=20normaliser=5Fdate,?=
=?UTF-8?q?=20de=20sorte=20qu'on=20puisse=20utiliser=20l'=C3=A9toile=20dan?=
=?UTF-8?q?s=20les=20balises=20de=20la=20famille=20#DATE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/public/balises.php | 11 +++++------
ecrire/public/interfaces.php | 8 ++++----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php
index 4f89532c56..571fd7575b 100644
--- a/ecrire/public/balises.php
+++ b/ecrire/public/balises.php
@@ -102,7 +102,7 @@ function balise_DATE_dist ($p) {
$d = champ_sql('date', $p);
# if ($d === "@\$Pile[0]['date']")
# $d = "isset(\$Pile[0]['date']) ? $d : time()";
- $p->code = "normaliser_date($d)";
+ $p->code = $d;
return $p;
}
@@ -113,7 +113,7 @@ function balise_DATE_REDAC_dist ($p) {
$d = champ_sql('date_redac', $p);
# if ($d === "@\$Pile[0]['date_redac']")
# $d = "isset(\$Pile[0]['date_redac']) ? $d : time()";
- $p->code = "normaliser_date($d)";
+ $p->code = $d;
$p->interdire_scripts = false;
return $p;
}
@@ -122,8 +122,7 @@ function balise_DATE_REDAC_dist ($p) {
// http://www.spip.net/fr_article1971.html
// http://doc.spip.org/@balise_DATE_MODIF_dist
function balise_DATE_MODIF_dist ($p) {
- $_date = champ_sql('date_modif', $p);
- $p->code = "$_date";
+ $p->code = champ_sql('date_modif', $p);
$p->interdire_scripts = false;
return $p;
}
@@ -133,8 +132,8 @@ function balise_DATE_MODIF_dist ($p) {
// http://doc.spip.org/@balise_DATE_NOUVEAUTES_dist
function balise_DATE_NOUVEAUTES_dist($p) {
$p->code = "((\$GLOBALS['meta']['quoi_de_neuf'] == 'oui'
- AND @file_exists(_DIR_TMP . 'mail.lock')) ?
- normaliser_date(@filemtime(_DIR_TMP . 'mail.lock')) :
+ AND @is_readable(_DIR_TMP . 'mail.lock')) ?
+ @filemtime(_DIR_TMP . 'mail.lock') :
\"'0000-00-00'\")";
$p->interdire_scripts = false;
return $p;
diff --git a/ecrire/public/interfaces.php b/ecrire/public/interfaces.php
index 139a86e366..d95cd1260b 100644
--- a/ecrire/public/interfaces.php
+++ b/ecrire/public/interfaces.php
@@ -287,10 +287,10 @@ define('_TRAITEMENT_RACCOURCIS', 'propre(%s, $connect)');
$table_des_traitements['BIO'][]= _TRAITEMENT_RACCOURCIS;
$table_des_traitements['CHAPO'][]= _TRAITEMENT_RACCOURCIS;
-$table_des_traitements['DATE'][]= 'vider_date(%s)';
-$table_des_traitements['DATE_MODIF'][]= 'vider_date(%s)';
-$table_des_traitements['DATE_NOUVEAUTES'][]= 'vider_date(%s)';
-$table_des_traitements['DATE_REDAC'][]= 'vider_date(%s)';
+$table_des_traitements['DATE'][]= 'normaliser_date(%s)';
+$table_des_traitements['DATE_REDAC'][]= 'normaliser_date(%s)';
+$table_des_traitements['DATE_MODIF'][]= 'normaliser_date(%s)';
+$table_des_traitements['DATE_NOUVEAUTES'][]= 'normaliser_date(%s)';
$table_des_traitements['DESCRIPTIF'][]= _TRAITEMENT_RACCOURCIS;
$table_des_traitements['FICHIER']['documents']= 'get_spip_doc(%s)';
$table_des_traitements['INTRODUCTION'][]= 'PtoBR('. _TRAITEMENT_RACCOURCIS .')';
--
GitLab