Changeset 18836

Timestamp:

09/30/2011 03:35:50 PM (13 years ago)

Author:

ryan

Message:

Pass the query object to _close_comments_for_old_posts() so that is_singular is checked for the proper query. Props kawauso. fixes #18109

Location:

trunk/wp-includes

Files:

• comment.php (modified) (2 diffs)
• default-filters.php (modified) (1 diff)

trunk/wp-includes/comment.php

@@ -1960 +1960 @@
  *
  * @param object $posts Post data object.
+ * @param object $query Query object.
  * @return object
  */
-function _close_comments_for_old_posts( $posts ) {
-    if ( empty($posts) || !is_singular() || !get_option('close_comments_for_old_posts') )
+function _close_comments_for_old_posts( $posts, $query ) {
+    if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
         return $posts;
 
@@ -1970 +1971 @@
         return $posts;
 
-    $days_old = (int) get_option('close_comments_days_old');
-    if ( !$days_old )
+    $days_old = (int) get_option( 'close_comments_days_old' );
+    if ( ! $days_old )
         return $posts;
 

trunk/wp-includes/default-filters.php

@@ -190 +190 @@
 add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );
 add_filter( 'option_category_base',     '_wp_filter_taxonomy_base'            );
-add_filter( 'the_posts',                '_close_comments_for_old_posts'       );
+add_filter( 'the_posts',                '_close_comments_for_old_posts', 10, 2);
 add_filter( 'comments_open',            '_close_comments_for_old_post', 10, 2 );
 add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );