From 36e92bac3d28cee42a8c86504c08165c39dcf2dc Mon Sep 17 00:00:00 2001 From: Laurent Zimmerli Date: Sat, 17 Apr 2021 22:45:50 +0200 Subject: [PATCH 1/6] Fix paragraph split, thanks to @pewgeuges --- class/task.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/class/task.php b/class/task.php index db61494..cd8cbe6 100644 --- a/class/task.php +++ b/class/task.php @@ -2094,6 +2094,8 @@ class MCI_Footnotes_Task { // Determine tooltip content. if ( MCI_Footnotes::$a_bool_tooltips_enabled ) { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; + $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#'); + $l_str_tooltip_content = preg_replace( $l_arr_paragraph_splitters, '
', $l_str_tooltip_content ); } else { $l_str_tooltip_content = ''; } From 242795a2b6dd273c30ac952b5cf2576d5f3714d7 Mon Sep 17 00:00:00 2001 From: Mark Cheret Date: Sat, 17 Apr 2021 23:28:05 +0200 Subject: [PATCH 2/6] Update task.php --- class/task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class/task.php b/class/task.php index cd8cbe6..18e12b0 100644 --- a/class/task.php +++ b/class/task.php @@ -2094,7 +2094,7 @@ class MCI_Footnotes_Task { // Determine tooltip content. if ( MCI_Footnotes::$a_bool_tooltips_enabled ) { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; - $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#'); + $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#' ); $l_str_tooltip_content = preg_replace( $l_arr_paragraph_splitters, '
', $l_str_tooltip_content ); } else { $l_str_tooltip_content = ''; From 3d85de134e877c27355ae49bda972f86cc5742ed Mon Sep 17 00:00:00 2001 From: Mark Cheret Date: Sat, 17 Apr 2021 23:32:43 +0200 Subject: [PATCH 3/6] Update task.php attribution --- class/task.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/class/task.php b/class/task.php index 18e12b0..4c2411a 100644 --- a/class/task.php +++ b/class/task.php @@ -2094,6 +2094,8 @@ class MCI_Footnotes_Task { // Determine tooltip content. if ( MCI_Footnotes::$a_bool_tooltips_enabled ) { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; + // @reporter @pewgeuges + // @link https://github.com/markcheret/footnotes/issues/103 $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#' ); $l_str_tooltip_content = preg_replace( $l_arr_paragraph_splitters, '
', $l_str_tooltip_content ); } else { From dc1ec81ad916a5829ca14d6e4391660628c982e4 Mon Sep 17 00:00:00 2001 From: Mark Cheret Date: Sun, 18 Apr 2021 00:19:23 +0200 Subject: [PATCH 4/6] Update task.php --- class/task.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/class/task.php b/class/task.php index 4c2411a..26fd87d 100644 --- a/class/task.php +++ b/class/task.php @@ -2094,8 +2094,11 @@ class MCI_Footnotes_Task { // Determine tooltip content. if ( MCI_Footnotes::$a_bool_tooltips_enabled ) { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; - // @reporter @pewgeuges - // @link https://github.com/markcheret/footnotes/issues/103 + /** + * @reporter @pewgeuges + * @link https://github.com/markcheret/footnotes/issues/103 + * @since 2.7.1 + */ $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#' ); $l_str_tooltip_content = preg_replace( $l_arr_paragraph_splitters, '
', $l_str_tooltip_content ); } else { From fd9cb2aaa955e738f9bb9734996f50a450e71ac8 Mon Sep 17 00:00:00 2001 From: Mark Cheret Date: Sun, 18 Apr 2021 00:23:19 +0200 Subject: [PATCH 5/6] Update task.php update docblock --- class/task.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/class/task.php b/class/task.php index 26fd87d..4ebf554 100644 --- a/class/task.php +++ b/class/task.php @@ -2095,9 +2095,11 @@ class MCI_Footnotes_Task { if ( MCI_Footnotes::$a_bool_tooltips_enabled ) { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; /** + * Ensures paragraph separation * @reporter @pewgeuges * @link https://github.com/markcheret/footnotes/issues/103 * @since 2.7.1 + * Ensures that footnotes containing paragraph separators get displayed correctly. */ $l_arr_paragraph_splitters = array( '#(

|]*>)#', '#(|]*>)#' ); $l_str_tooltip_content = preg_replace( $l_arr_paragraph_splitters, '
', $l_str_tooltip_content ); From 5b02a3dd08d26dbf64cb24daf2c3b670b41539c5 Mon Sep 17 00:00:00 2001 From: Mark Cheret Date: Sun, 18 Apr 2021 00:26:44 +0200 Subject: [PATCH 6/6] fixing docblock formatting --- class/task.php | 1 + 1 file changed, 1 insertion(+) diff --git a/class/task.php b/class/task.php index 4ebf554..92f0ec1 100644 --- a/class/task.php +++ b/class/task.php @@ -2096,6 +2096,7 @@ class MCI_Footnotes_Task { $l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text; /** * Ensures paragraph separation + * * @reporter @pewgeuges * @link https://github.com/markcheret/footnotes/issues/103 * @since 2.7.1