From 8d70fba45ac77cf6f12d2dc99263ba2a354554fb Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 14 Sep 2007 21:20:58 +0000
Subject: [PATCH] retablir les appels {{{ [[ <x> truc ]] }}}, et la detection
des paragraphes {{{ <p class='...'> }}}, cf. [10301]
---
ecrire/inc/texte.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php
index d8fce3b986..440aeb15dd 100644
--- a/ecrire/inc/texte.php
+++ b/ecrire/inc/texte.php
@@ -1327,8 +1327,8 @@ function traiter_raccourcis($letexte) {
$letexte = preg_replace(",\r\n?,S", "\n", $letexte);
// Recuperer les paragraphes HTML
- $letexte = preg_replace(',<p[>]\s,iS', "\n\n\\0", $letexte);
- $letexte = preg_replace(',</p[>]\s,iS', "\\0\n\n", $letexte);
+ $letexte = preg_replace(',<p\b,iS', "\n\n\\0", $letexte);
+ $letexte = preg_replace(',</p\b,iS', "\\0\n\n", $letexte);
$letexte = traiter_raccourci_glossaire($letexte);
$letexte = traiter_raccourci_ancre($letexte);
@@ -1427,9 +1427,9 @@ function traite_raccourci_notes($letexte)
$num_note = false;
// note auto ou pas ?
- if (preg_match(",^<([^>]*)>,", $note_texte, $regs)){
+ if (preg_match(",^<([^>]*)>,", ltrim($note_texte), $regs)){
$num_note = $regs[1];
- $note_texte = str_replace($regs[0], "", $note_texte);
+ $note_texte = substr_replace(ltrim($note_texte), '', 0, strlen($regs[0]));
} else {
$compt_note++;
$num_note = $compt_note;
--
GitLab