WordPress 4.3.1

[autoinstalls/wordpress.git] / wp-includes / formatting.php

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index fa9551a3e4bcda175fce60bf44a9f64b98718473..640e136fcf62c0801f12f241cda9d5ed37240255 100644 (file)
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -596,7 +596,9 @@ function wpautop( $pee, $br = true ) {
                $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
        // Restore newlines in all elements.
                $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
        // Restore newlines in all elements.

-       $pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
+       if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
+               $pee = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $pee );
+       }

 
        return $pee;
 }
 
        return $pee;
 }