malhuda/fictioneer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 112 Wiki Activity

Fix comment line break wrapping

Browse Source
This commit is contained in:
Tetrakern 2023-05-12 14:21:33 +02:00
parent 3d7c290a3e
commit 668f3c0520
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CREDITS.md
View File

@ -156,11 +156,6 @@ The following list credits all third-party resources used in the Fictioneer them
License: [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)<br>
Source: https://wordpress.stackexchange.com/a/28147/223620
* **Line breaks to paragraphs**<br>
Copyright: lflier<br>
License: [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html) (WordPress default)<br>
Source: https://wpdiscuz.com/community/general-forum/all-comment-body-inside-one-paragraph/#post-2031
* **Relocate cancel reply link**<br>
Copyright: zeroeffect78<br>
License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)<br>

17
includes/functions/comments/_comments_threads.php
View File

@ -346,10 +346,10 @@ if ( ! function_exists( 'fictioneer_get_comment_badge' ) ) {
if ( ! function_exists( 'fictioneer_replace_comment_line_breaks' ) ) {
/**
* Properly wrap lines into paragraphs
* Properly wrap empty lines into paragraphs
*
* @since Fictioneer 4.0
* @link https://wpdiscuz.com/community/general-forum/all-comment-body-inside-one-paragraph/#post-2031
* @since Fictioneer 5.2.6 Updated and changed to not mess up some languages.
*
* @param string $comment_content The comment content.
*
@ -357,9 +357,16 @@ if ( ! function_exists( 'fictioneer_replace_comment_line_breaks' ) ) {
*/
function fictioneer_replace_comment_line_breaks( $comment_content ) {
$comment_content = preg_replace( '/[^ -~]{4}/', '<p></p>', $comment_content );
$comment_content = preg_replace( '/\x0a/', '<p></p>', $comment_content );
return $comment_content;
$lines = preg_split( '/\R/', $comment_content );
$wrapped = array_map( function( $line ) {
if ( trim( $line ) === '' ) {
return '<p></p>';
}
return $line;
}, $lines );
return implode( PHP_EOL, $wrapped );
}
}