Changeset 8298

Timestamp:

07/09/2008 04:52:27 AM (18 years ago)

Author:

ryan

Message:

Hands off pre tags. Props nbachiyski. fixes #7056

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -4 +4 @@
         global $wp_cockneyreplace;
         $next = true;
+        $has_pre_parent = false;
         $output = '';
         $curl = '';
@@ -27 +28 @@
                 $curl = $textarr[$i];
 
-                if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag
+                if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next && !$has_pre_parent) { // If it's not a tag
                         // static strings
                         $curl = str_replace($static_characters, $static_replacements, $curl);
                         // regular expressions
                         $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-                } elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
+                } elseif (strpos($curl, '<code') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
                         $next = false;
+                } elseif (strpos($curl, '<pre') !== false) {
+                        $has_pre_parent = true;
+                } elseif (strpos($curl, '</pre>') !== false) {
+                        $has_pre_parent = false;
                 } else {
                         $next = true;