[wp-cvs] wordpress/wp-includes template-functions-comment.php, 1.34, 1.35 template-functions-links.php, 1.42, 1.43

[Ryan Boren]

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

Modified Files:
	template-functions-comment.php template-functions-links.php 
Log Message:
Allow comments on pages.  Props: error http://wordpress.org/support/6/16759

Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** template-functions-links.php	12 Nov 2004 23:08:51 -0000	1.42
--- template-functions-links.php	17 Nov 2004 03:45:50 -0000	1.43
***************
*** 51,55 ****
  
  	if ($idpost->post_status == 'static') {
! 		return get_page_link();
  	}
  
--- 51,55 ----
  
  	if ($idpost->post_status == 'static') {
! 		return get_page_link($idpost->ID);
  	}
  

Index: template-functions-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-comment.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** template-functions-comment.php	22 Oct 2004 15:51:08 -0000	1.34
--- template-functions-comment.php	17 Nov 2004 03:45:49 -0000	1.35
***************
*** 26,30 ****
  	global $withcomments, $post, $wpdb, $id, $comment;
  
! 	if ( is_single() || $withcomments ) :
  		$req = get_settings('require_name_email');
          $comment_author = isset($_COOKIE['comment_author_'.COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_'.COOKIEHASH])) : '';
--- 26,30 ----
  	global $withcomments, $post, $wpdb, $id, $comment;
  
! 	if ( is_single() || is_page() || $withcomments ) :
  		$req = get_settings('require_name_email');
          $comment_author = isset($_COOKIE['comment_author_'.COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_'.COOKIEHASH])) : '';
***************
*** 101,105 ****
      global $comment_count_cache;
  
! 	if (! is_single()) {
      if ('' == $comment_count_cache["$id"]) {
          $number = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';");
--- 101,105 ----
      global $comment_count_cache;
  
! 	if (! is_single() && ! is_page()) {
      if ('' == $comment_count_cache["$id"]) {
          $number = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';");