From 8ca9789e2933db8a0dc79389ccbeb54ca2443a61 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 21 Dec 2006 01:54:15 +0000 Subject: [PATCH] kses function reorg to match trunk. git-svn-id: http://svn.automattic.com/wordpress/branches/2.0@4653 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/kses.php | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/wp-includes/kses.php b/wp-includes/kses.php index faae1d1e20..072a96a723 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -524,23 +524,34 @@ function wp_filter_post_kses($data) { } function kses_init_filters() { - add_filter('pre_comment_author', 'wp_filter_kses'); - add_filter('pre_comment_content', 'wp_filter_kses'); - add_filter('content_save_pre', 'wp_filter_post_kses'); - add_filter('content_filtered_save_pre', 'wp_filter_post_kses'); - add_filter('title_save_pre', 'wp_filter_kses'); + // Normal filtering. + add_filter('pre_comment_content', 'wp_filter_kses'); + add_filter('title_save_pre', 'wp_filter_kses'); + + // Post filtering + add_filter('content_save_pre', 'wp_filter_post_kses'); + add_filter('excerpt_save_pre', 'wp_filter_post_kses'); + add_filter('content_filtered_save_pre', 'wp_filter_post_kses'); +} + +function kses_remove_filters() { + // Normal filtering. + remove_filter('pre_comment_content', 'wp_filter_kses'); + remove_filter('title_save_pre', 'wp_filter_kses'); + + // Post filtering + remove_filter('content_save_pre', 'wp_filter_post_kses'); + remove_filter('excerpt_save_pre', 'wp_filter_post_kses'); + remove_filter('content_filtered_save_pre', 'wp_filter_post_kses'); } function kses_init() { - remove_filter('pre_comment_author', 'wp_filter_kses'); - remove_filter('pre_comment_content', 'wp_filter_kses'); - remove_filter('content_save_pre', 'wp_filter_post_kses'); - remove_filter('content_filtered_save_pre', 'wp_filter_post_kses'); - remove_filter('title_save_pre', 'wp_filter_kses'); + kses_remove_filters(); if (current_user_can('unfiltered_html') == false) kses_init_filters(); } + add_action('init', 'kses_init'); add_action('set_current_user', 'kses_init'); ?>