diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php new file mode 100644 index 000000000..4c491c416 --- /dev/null +++ b/wp-includes/default-filters.php @@ -0,0 +1,78 @@ + \ No newline at end of file diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php index 5f95f6cb2..311d293df 100644 --- a/wp-includes/functions-formatting.php +++ b/wp-includes/functions-formatting.php @@ -1,7 +1,5 @@
' . __("This post is password protected. To view it please enter your password below:") . '
diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 1619576bb..5021d4ef8 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -38,62 +38,62 @@ $is_apache = strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') ? 1 : 0; // if the config file does not provide the smilies array, let's define it here if (!isset($wpsmiliestrans)) { - $wpsmiliestrans = array( - ' :)' => 'icon_smile.gif', - ' :D' => 'icon_biggrin.gif', - ' :-D' => 'icon_biggrin.gif', - ':grin:' => 'icon_biggrin.gif', - ' :)' => 'icon_smile.gif', - ' :-)' => 'icon_smile.gif', - ':smile:' => 'icon_smile.gif', - ' :(' => 'icon_sad.gif', - ' :-(' => 'icon_sad.gif', - ':sad:' => 'icon_sad.gif', - ' :o' => 'icon_surprised.gif', - ' :-o' => 'icon_surprised.gif', - ':eek:' => 'icon_surprised.gif', - ' 8O' => 'icon_eek.gif', - ' 8-O' => 'icon_eek.gif', - ':shock:' => 'icon_eek.gif', - ' :?' => 'icon_confused.gif', - ' :-?' => 'icon_confused.gif', - ' :???:' => 'icon_confused.gif', - ' 8)' => 'icon_cool.gif', - ' 8-)' => 'icon_cool.gif', - ':cool:' => 'icon_cool.gif', - ':lol:' => 'icon_lol.gif', - ' :x' => 'icon_mad.gif', - ' :-x' => 'icon_mad.gif', - ':mad:' => 'icon_mad.gif', - ' :P' => 'icon_razz.gif', - ' :-P' => 'icon_razz.gif', - ':razz:' => 'icon_razz.gif', - ':oops:' => 'icon_redface.gif', - ':cry:' => 'icon_cry.gif', - ':evil:' => 'icon_evil.gif', - ':twisted:' => 'icon_twisted.gif', - ':roll:' => 'icon_rolleyes.gif', - ':wink:' => 'icon_wink.gif', - ' ;)' => 'icon_wink.gif', - ' ;-)' => 'icon_wink.gif', - ':!:' => 'icon_exclaim.gif', - ':?:' => 'icon_question.gif', - ':idea:' => 'icon_idea.gif', - ':arrow:' => 'icon_arrow.gif', - ' :|' => 'icon_neutral.gif', - ' :-|' => 'icon_neutral.gif', - ':neutral:' => 'icon_neutral.gif', - ':mrgreen:' => 'icon_mrgreen.gif', - ); + $wpsmiliestrans = array( + ' :)' => 'icon_smile.gif', + ' :D' => 'icon_biggrin.gif', + ' :-D' => 'icon_biggrin.gif', + ':grin:' => 'icon_biggrin.gif', + ' :)' => 'icon_smile.gif', + ' :-)' => 'icon_smile.gif', + ':smile:' => 'icon_smile.gif', + ' :(' => 'icon_sad.gif', + ' :-(' => 'icon_sad.gif', + ':sad:' => 'icon_sad.gif', + ' :o' => 'icon_surprised.gif', + ' :-o' => 'icon_surprised.gif', + ':eek:' => 'icon_surprised.gif', + ' 8O' => 'icon_eek.gif', + ' 8-O' => 'icon_eek.gif', + ':shock:' => 'icon_eek.gif', + ' :?' => 'icon_confused.gif', + ' :-?' => 'icon_confused.gif', + ' :???:' => 'icon_confused.gif', + ' 8)' => 'icon_cool.gif', + ' 8-)' => 'icon_cool.gif', + ':cool:' => 'icon_cool.gif', + ':lol:' => 'icon_lol.gif', + ' :x' => 'icon_mad.gif', + ' :-x' => 'icon_mad.gif', + ':mad:' => 'icon_mad.gif', + ' :P' => 'icon_razz.gif', + ' :-P' => 'icon_razz.gif', + ':razz:' => 'icon_razz.gif', + ':oops:' => 'icon_redface.gif', + ':cry:' => 'icon_cry.gif', + ':evil:' => 'icon_evil.gif', + ':twisted:' => 'icon_twisted.gif', + ':roll:' => 'icon_rolleyes.gif', + ':wink:' => 'icon_wink.gif', + ' ;)' => 'icon_wink.gif', + ' ;-)' => 'icon_wink.gif', + ':!:' => 'icon_exclaim.gif', + ':?:' => 'icon_question.gif', + ':idea:' => 'icon_idea.gif', + ':arrow:' => 'icon_arrow.gif', + ' :|' => 'icon_neutral.gif', + ' :-|' => 'icon_neutral.gif', + ':neutral:' => 'icon_neutral.gif', + ':mrgreen:' => 'icon_mrgreen.gif', + ); } // sorts the smilies' array if (!function_exists('smiliescmp')) { - function smiliescmp ($a, $b) { - if (strlen($a) == strlen($b)) { - return strcmp($a, $b); - } - return (strlen($a) > strlen($b)) ? -1 : 1; +function smiliescmp ($a, $b) { + if (strlen($a) == strlen($b)) { + return strcmp($a, $b); + } + return (strlen($a) > strlen($b)) ? -1 : 1; } } uksort($wpsmiliestrans, 'smiliescmp'); @@ -109,62 +109,4 @@ foreach($wpsmiliestrans as $smiley => $img) { define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) ); define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) ); -// Some default filters -add_filter('bloginfo','wp_specialchars'); -add_filter('category_description', 'wptexturize'); -add_filter('list_cats', 'wptexturize'); -add_filter('comment_author', 'wptexturize'); -add_filter('comment_text', 'wptexturize'); -add_filter('single_post_title', 'wptexturize'); -add_filter('the_title', 'wptexturize'); -add_filter('the_content', 'wptexturize'); -add_filter('the_excerpt', 'wptexturize'); -add_filter('bloginfo', 'wptexturize'); - -// Comments, trackbacks, pingbacks -add_filter('pre_comment_author_name', 'strip_tags'); -add_filter('pre_comment_author_name', 'trim'); -add_filter('pre_comment_author_name', 'wp_specialchars', 30); - -add_filter('pre_comment_author_email', 'trim'); -add_filter('pre_comment_author_email', 'sanitize_email'); - -add_filter('pre_comment_author_url', 'strip_tags'); -add_filter('pre_comment_author_url', 'trim'); -add_filter('pre_comment_author_url', 'clean_url'); - -add_filter('pre_comment_content', 'stripslashes', 1); -add_filter('pre_comment_content', 'wp_filter_kses'); -add_filter('pre_comment_content', 'wp_rel_nofollow', 15); -add_filter('pre_comment_content', 'balanceTags', 30); -add_filter('pre_comment_content', 'addslashes', 50); - -add_filter('pre_comment_author_name', 'wp_filter_kses'); -add_filter('pre_comment_author_email', 'wp_filter_kses'); -add_filter('pre_comment_author_url', 'wp_filter_kses'); - -// Default filters for these functions -add_filter('comment_author', 'wptexturize'); -add_filter('comment_author', 'convert_chars'); -add_filter('comment_author', 'wp_specialchars'); - -add_filter('comment_email', 'antispambot'); - -add_filter('comment_url', 'clean_url'); - -add_filter('comment_text', 'convert_chars'); -add_filter('comment_text', 'make_clickable'); -add_filter('comment_text', 'wpautop', 30); -add_filter('comment_text', 'convert_smilies', 20); - -add_filter('comment_text_rss', 'htmlspecialchars'); - -add_filter('comment_excerpt', 'convert_chars'); -add_filter('the_excerpt_rss', 'convert_chars'); - -// Places to balance tags on input -add_filter('content_save_pre', 'balanceTags', 50); -add_filter('excerpt_save_pre', 'balanceTags', 50); -add_filter('comment_save_pre', 'balanceTags', 50); - ?> \ No newline at end of file diff --git a/wp-rdf.php b/wp-rdf.php index bf2488648..6233d0e75 100644 --- a/wp-rdf.php +++ b/wp-rdf.php @@ -9,7 +9,6 @@ if (empty($feed)) { header('Content-type: application/rdf+xml; charset=' . get_settings('blog_charset'), true); $more = 1; -add_filter('the_content', 'trim'); ?> '; ?> diff --git a/wp-settings.php b/wp-settings.php index c1309e5df..1ce9f0839 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -61,6 +61,7 @@ $tableoptions = $wpdb->options; $tablepostmeta = $wpdb->postmeta; require (ABSPATH . WPINC . '/functions.php'); +require (ABSPATH . WPINC . '/default-filters.php'); require_once (ABSPATH . WPINC . '/wp-l10n.php'); $wpdb->hide_errors();