Index: default-filters.php
===================================================================
--- default-filters.php	(revision 5043)
+++ default-filters.php	(working copy)
@@ -1,5 +1,9 @@
 <?php
 
+function __trim($text) {
+   return trim($text);
+}
+
 // Some default filters
 add_filter('bloginfo','wp_specialchars');
 add_filter('category_description', 'wptexturize');
@@ -14,14 +18,14 @@
 
 // Comments, trackbacks, pingbacks
 add_filter('pre_comment_author_name', 'strip_tags');
-add_filter('pre_comment_author_name', 'trim');
+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', '__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', '__trim');
 add_filter('pre_comment_author_url', 'clean_url');
 
 add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
@@ -54,59 +58,59 @@
 
 // Categories
 add_filter('pre_category_name', 'strip_tags');
-add_filter('pre_category_name', 'trim');
+add_filter('pre_category_name', '__trim');
 add_filter('pre_category_name', 'wp_filter_kses');
 add_filter('pre_category_name', 'wp_specialchars', 30);
 add_filter('pre_category_description', 'wp_filter_kses');
 
 //Links
 add_filter('pre_link_name', 'strip_tags');
-add_filter('pre_link_name', 'trim');
+add_filter('pre_link_name', '__trim');
 add_filter('pre_link_name', 'wp_filter_kses');
 add_filter('pre_link_name', 'wp_specialchars', 30);
 add_filter('pre_link_description', 'wp_filter_kses');
 add_filter('pre_link_notes', 'wp_filter_kses');
 add_filter('pre_link_url', 'strip_tags');
-add_filter('pre_link_url', 'trim');
+add_filter('pre_link_url', '__trim');
 add_filter('pre_link_url', 'clean_url');
 add_filter('pre_link_image', 'strip_tags');
-add_filter('pre_link_image', 'trim');
+add_filter('pre_link_image', '__trim');
 add_filter('pre_link_image', 'clean_url');
 add_filter('pre_link_rss', 'strip_tags');
-add_filter('pre_link_rss', 'trim');
+add_filter('pre_link_rss', '__trim');
 add_filter('pre_link_rss', 'clean_url');
 add_filter('pre_link_target', 'strip_tags');
-add_filter('pre_link_target', 'trim');
+add_filter('pre_link_target', '__trim');
 add_filter('pre_link_target', 'wp_filter_kses');
 add_filter('pre_link_target', 'wp_specialchars', 30);
 add_filter('pre_link_rel', 'strip_tags');
-add_filter('pre_link_rel', 'trim');
+add_filter('pre_link_rel', '__trim');
 add_filter('pre_link_rel', 'wp_filter_kses');
 add_filter('pre_link_rel', 'wp_specialchars', 30);
 
 // Users
 add_filter('pre_user_display_name', 'strip_tags');
-add_filter('pre_user_display_name', 'trim');
+add_filter('pre_user_display_name', '__trim');
 add_filter('pre_user_display_name', 'wp_filter_kses');
 add_filter('pre_user_display_name', 'wp_specialchars', 30);
 add_filter('pre_user_first_name', 'strip_tags');
-add_filter('pre_user_first_name', 'trim');
+add_filter('pre_user_first_name', '__trim');
 add_filter('pre_user_first_name', 'wp_filter_kses');
 add_filter('pre_user_first_name', 'wp_specialchars', 30);
 add_filter('pre_user_last_name', 'strip_tags');
-add_filter('pre_user_last_name', 'trim');
+add_filter('pre_user_last_name', '__trim');
 add_filter('pre_user_last_name', 'wp_filter_kses');
 add_filter('pre_user_last_name', 'wp_specialchars', 30);
 add_filter('pre_user_nickname', 'strip_tags');
-add_filter('pre_user_nickname', 'trim');
+add_filter('pre_user_nickname', '__trim');
 add_filter('pre_user_nickname', 'wp_filter_kses');
 add_filter('pre_user_nickname', 'wp_specialchars', 30);
-add_filter('pre_user_description', 'trim');
+add_filter('pre_user_description', '__trim');
 add_filter('pre_user_description', 'wp_filter_kses');
 add_filter('pre_user_url', 'strip_tags');
-add_filter('pre_user_url', 'trim');
+add_filter('pre_user_url', '__trim');
 add_filter('pre_user_url', 'clean_url');
-add_filter('pre_user_email', 'trim');
+add_filter('pre_user_email', '__trim');
 add_filter('pre_user_email', 'sanitize_email');
 
 // Places to balance tags on input
@@ -116,7 +120,7 @@
 
 // Misc. title, content, and excerpt filters
 add_filter('the_title', 'convert_chars');
-add_filter('the_title', 'trim');
+add_filter('the_title', '__trim');
 
 add_filter('the_content', 'convert_smilies');
 add_filter('the_content', 'convert_chars');