Make WordPress Core

Changeset 333


Ignore:
Timestamp:
08/24/2003 04:46:09 PM (22 years ago)
Author:
saxmatt
Message:

Some significant fixes to autop.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/b2-include/b2functions.php

    r322 r333  
    6767function wpautop($pee, $br=1) {
    6868    $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
     69    $pee = preg_replace('!(<(?:table|ul|ol|li|pre|select|form|blockquote)[^>]*>)!', "\n$1", $pee); // Space things out a little
    6970    $pee = preg_replace("/(\r\n|\n|\r)/", "\n", $pee); // cross-platform newlines
    7071    $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
    7172    $pee = preg_replace('/\n?(.+?)(\n\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
    72     $pee = str_replace('<br /></p>', '</p>', $pee);
    73     $pee = str_replace('<p><p>', '<p>', $pee);
    74     $pee = str_replace('</p></p>', '</p>', $pee);
     73    $pee = preg_replace('|<br />\s*</p>|', '</p>', $pee);
     74    $pee = preg_replace('|<p>\s*<p>|', '<p>', $pee);
     75    $pee = preg_replace('|</p>\s*</p>|', '</p>', $pee);
     76    $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
     77    $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
    7578    $pee = preg_replace('!<p>\s*(</?(?:table|ul|ol|li|pre|select|form|blockquote)[^>]*>)!', "$1", $pee);
    7679    $pee = preg_replace('!(</?(?:table|ul|ol|li|pre|select|form|blockquote)>)\s*</p>!', "$1", $pee);
    7780    if ($br) $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
    7881    $pee = preg_replace('!(</?(?:table|ul|ol|li|pre|select|form|blockquote|p)[^>]*>)<br />!', "$1", $pee);
    79     $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
    80     $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
    8182    $pee = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $pee);
    8283   
Note: See TracChangeset for help on using the changeset viewer.