[wp-cvs] wordpress/wp-includes functions-formatting.php, 1.33, 1.34 template-functions-comment.php, 1.24, 1.25 template-functions-post.php, 1.26, 1.27

[Ryan Boren]

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

Modified Files:
	functions-formatting.php template-functions-comment.php 
	template-functions-post.php 
Log Message:
Get our slashes straight.

Index: template-functions-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-comment.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** template-functions-comment.php	10 Jun 2004 09:17:41 -0000	1.24
--- template-functions-comment.php	11 Jun 2004 08:02:40 -0000	1.25
***************
*** 22,28 ****
  	if ( $single || $withcomments ) :
  		$req = get_settings('require_name_email');
! 		$comment_author = isset($_COOKIE['comment_author_'.$cookiehash]) ? trim($_COOKIE['comment_author_'.$cookiehash]) : '';
! 		$comment_author_email = isset($_COOKIE['comment_author_email_'.$cookiehash]) ? trim($_COOKIE['comment_author_email_'.$cookiehash]) : '';
! 		$comment_author_url = isset($_COOKIE['comment_author_url_'.$cookiehash]) ? trim($_COOKIE['comment_author_url_'.$cookiehash]) : '';
  		$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
  		include(ABSPATH . 'wp-comments.php');
--- 22,28 ----
  	if ( $single || $withcomments ) :
  		$req = get_settings('require_name_email');
!         $comment_author = isset($_COOKIE['comment_author_'.$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_'.$cookiehash])) : '';
! 		$comment_author_email = isset($_COOKIE['comment_author_email_'.$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_email_'.$cookiehash])) : '';
! 		$comment_author_url = isset($_COOKIE['comment_author_url_'.$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_url_'.$cookiehash])) : '';
  		$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
  		include(ABSPATH . 'wp-comments.php');

Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** functions-formatting.php	10 Jun 2004 10:01:45 -0000	1.33
--- functions-formatting.php	11 Jun 2004 08:02:40 -0000	1.34
***************
*** 268,272 ****
  
  function format_to_edit($content) {
- 	$content = stripslashes($content);
  	$content = apply_filters('format_to_edit', $content);
  	$content = htmlspecialchars($content);
--- 268,271 ----

Index: template-functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** template-functions-post.php	8 Jun 2004 09:29:41 -0000	1.26
--- template-functions-post.php	11 Jun 2004 08:02:40 -0000	1.27
***************
*** 103,107 ****
  
      if (!empty($post->post_password)) { // if there's a password
!         if ($_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) {  // and it doesn't match the cookie
              $output = get_the_password_form();
              return $output;
--- 103,107 ----
  
      if (!empty($post->post_password)) { // if there's a password
!         if (stripslashes($_COOKIE['wp-postpass_'.$cookiehash]) != $post->post_password) {  // and it doesn't match the cookie
              $output = get_the_password_form();
              return $output;
***************
*** 179,183 ****
      global $cookiehash;
      $output = '';
!     $output = stripslashes($post->post_excerpt);
      if (!empty($post->post_password)) { // if there's a password
          if ($_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) {  // and it doesn't match the cookie
--- 179,183 ----
      global $cookiehash;
      $output = '';
!     $output = $post->post_excerpt;
      if (!empty($post->post_password)) { // if there's a password
          if ($_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) {  // and it doesn't match the cookie
***************
*** 189,193 ****
      // If we haven't got an excerpt, make one in the style of the rss ones
      if (($output == '') && $fakeit) {
!         $output = $post->post_content;
          $output = strip_tags($output);
          $blah = explode(' ', $output);
--- 189,193 ----
      // If we haven't got an excerpt, make one in the style of the rss ones
      if (($output == '') && $fakeit) {
!         $output = stripslashes($post->post_content);
          $output = strip_tags($output);
          $blah = explode(' ', $output);