diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-02-01 17:51:15 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-02-01 17:51:15 +0000 |
| commit | 7772b266a9a06ff94cae1e64ef98d73c79e98b68 (patch) | |
| tree | d23086b885b1c652caa1a7f6c94ead8a1130355f /engine | |
| parent | f1ad194e108957db88953125403cfc21c790ad95 (diff) | |
| download | elgg-7772b266a9a06ff94cae1e64ef98d73c79e98b68.tar.gz elgg-7772b266a9a06ff94cae1e64ef98d73c79e98b68.tar.bz2 | |
Fixes #1398: autop() doesn't call missing clean_pre() function.
git-svn-id: http://code.elgg.org/elgg/trunk@3890 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/input.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php index 7c5fd58c4..67a61446d 100644 --- a/engine/lib/input.php +++ b/engine/lib/input.php @@ -173,9 +173,10 @@ function autop($pee, $br = 1) { } $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee); $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee); - if (strpos($pee, '<pre') !== false) { - $pee = preg_replace_callback('!(<pre.*?>)(.*?)</pre>!is', 'clean_pre', $pee ); - } +// if (strpos($pee, '<pre') !== false) { +// mind the space between the ? and >. Only there because of the comment. +// $pee = preg_replace_callback('!(<pre.*? >)(.*?)</pre>!is', 'clean_pre', $pee ); +// } $pee = preg_replace( "|\n</p>$|", '</p>', $pee ); return $pee; |