[wp-cvs] wordpress/wp-includes default-filters.php, NONE, 1.1 functions-formatting.php, 1.65, 1.66 functions.php, 1.254, 1.255 template-functions-post.php, 1.45, 1.46 vars.php, 1.48, 1.49

Matthew Mullenweg saxmatt at users.sourceforge.net
Mon Feb 7 07:46:43 GMT 2005


Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12511/wp-includes

Modified Files:
	functions-formatting.php functions.php 
	template-functions-post.php vars.php 
Added Files:
	default-filters.php 
Log Message:
Some filter action and cleanup

Index: vars.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/vars.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** vars.php	7 Feb 2005 07:37:53 -0000	1.48
--- vars.php	7 Feb 2005 07:46:40 -0000	1.49
***************
*** 39,98 ****
  // 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',
!     );
  }
  
  // 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;
  	}
  }
--- 39,98 ----
  // 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',
! 	);
  }
  
  // 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;
  	}
  }
***************
*** 110,170 ****
  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
--- 110,112 ----

Index: template-functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** template-functions-post.php	7 Feb 2005 07:37:53 -0000	1.45
--- template-functions-post.php	7 Feb 2005 07:46:40 -0000	1.46
***************
*** 1,18 ****
  <?php
  
- // Default filters
- add_filter('the_title', 'convert_chars');
- add_filter('the_title', 'trim');
- 
- add_filter('the_title_rss', 'strip_tags');
- 
- add_filter('the_content', 'convert_smilies');
- add_filter('the_content', 'convert_chars');
- add_filter('the_content', 'wpautop');
- 
- add_filter('the_excerpt', 'convert_smilies');
- add_filter('the_excerpt', 'convert_chars');
- add_filter('the_excerpt', 'wpautop');
- 
  function get_the_password_form() {
      $output = '<form action="' . get_settings('siteurl') . '/wp-pass.php" method="post">
--- 1,4 ----

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.254
retrieving revision 1.255
diff -C2 -d -r1.254 -r1.255
*** functions.php	7 Feb 2005 06:43:18 -0000	1.254
--- functions.php	7 Feb 2005 07:46:40 -0000	1.255
***************
*** 617,622 ****
  }
  
- add_action('publish_post', 'generic_ping');
- 
  // Send a Trackback
  function trackback($trackback_url, $title, $excerpt, $ID) {
--- 617,620 ----

--- NEW FILE: default-filters.php ---
<?php

// 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);

add_filter('the_title', 'convert_chars');
add_filter('the_title', 'trim');

add_filter('the_title_rss', 'strip_tags');

add_filter('the_content', 'convert_smilies');
add_filter('the_content', 'convert_chars');
add_filter('the_content', 'wpautop');

add_filter('the_excerpt', 'convert_smilies');
add_filter('the_excerpt', 'convert_chars');
add_filter('the_excerpt', 'wpautop');

add_filter('sanitize_title', 'sanitize_title_with_dashes');

add_action('publish_post', 'generic_ping');

?>
Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** functions-formatting.php	1 Feb 2005 08:31:13 -0000	1.65
--- functions-formatting.php	7 Feb 2005 07:46:40 -0000	1.66
***************
*** 1,6 ****
  <?php
  
- add_filter('sanitize_title', 'sanitize_title_with_dashes');
- 
  function wptexturize($text) {
  	$output = '';
--- 1,4 ----



More information about the cvs mailing list