[wp-cvs] wordpress/wp-admin edit-comments.php, 1.37, 1.38 upgrade-functions.php, 1.78, 1.79

[Matthew Mullenweg]

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

Modified Files:
	edit-comments.php upgrade-functions.php 
Log Message:
Fix GUID generation

Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** edit-comments.php	5 Oct 2004 07:25:21 -0000	1.37
--- edit-comments.php	5 Oct 2004 07:36:49 -0000	1.38
***************
*** 7,11 ****
  require_once('admin-header.php');
  if (empty($_GET['mode'])) $mode = 'view';
! else $mode = $_GET['mode'];
  ?>
  
--- 7,11 ----
  require_once('admin-header.php');
  if (empty($_GET['mode'])) $mode = 'view';
! else $mode = htmlspecialchars($_GET['mode']);
  ?>
  
***************
*** 107,111 ****
  <form action="" method="get">
  <p class="submit">
! <input type="hidden" name="offset" value="<?php echo $_GET['offset']+ 1; ?>" />
  <input type="submit" name="submit" value="<?php _e('View Next 20 Comments &raquo;');?>" />
  </p>
--- 107,111 ----
  <form action="" method="get">
  <p class="submit">
! <input type="hidden" name="offset" value="<?php echo $_GET['offset'] + 1; ?>" />
  <input type="submit" name="submit" value="<?php _e('View Next 20 Comments &raquo;');?>" />
  </p>

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** upgrade-functions.php	27 Sep 2004 13:52:46 -0000	1.78
--- upgrade-functions.php	5 Oct 2004 07:36:49 -0000	1.79
***************
*** 34,39 ****
  
  	$wpdb->query("UPDATE $wpdb->options SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
!                                                       WHERE option_name LIKE 'links_rating_image%'
!                                                       AND option_value LIKE 'wp-links/links-images/%'");
  
  	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
--- 34,39 ----
  
  	$wpdb->query("UPDATE $wpdb->options SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
! 	WHERE option_name LIKE 'links_rating_image%'
! 	AND option_value LIKE 'wp-links/links-images/%'");
  
  	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
***************
*** 149,153 ****
              $post_excerpt = addslashes(deslash($post->post_excerpt));
  			if ( empty($post->guid) )
! 				$guid = get_option('home') . '/' . get_permalink();
  			else
  				$guid = $post->guid;
--- 149,153 ----
              $post_excerpt = addslashes(deslash($post->post_excerpt));
  			if ( empty($post->guid) )
! 				$guid = get_permalink($post->ID);
  			else
  				$guid = $post->guid;
***************
*** 195,199 ****
  	// Update comments table to use comment_type
  	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
! 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
  
  }
--- 195,199 ----
  	// Update comments table to use comment_type
  	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
! 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
  
  }