diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php index 4f89532c5690a92c5e35c0164aa1e8903cc75f71..571fd7575bc919ee9e7df831bbca82064af7a1e8 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 139a86e366ca757f91760e6576ab95cea4babb67..d95cd1260b8d038804e31894f7bd019943bc6417 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 .')';