Changeset 4694 for trunk/includes/common/functions.php

Timestamp:

01/22/2013 03:49:42 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix broken single forum feeds by avoiding get_page_by_path(). Props alex-ye. Fixes #2167.

File:

• trunk/includes/common/functions.php (modified) (9 diffs)

trunk/includes/common/functions.php

@@ -106 +106 @@
          */
         function bbp_get_time_since( $older_date, $newer_date = false ) {
-                
+
                 // Setup the strings
                 $unknown_text   = apply_filters( 'bbp_core_time_since_unknown_text',   __( 'sometime',  'bbpress' ) );
@@ -573 +573 @@
                 'empty_topic_tag_count'
         ) ) );
-        
+
         // Add the hidden (topic/reply) count title attribute strings because we
         // don't need to run the math functions on these (see above)
@@ -737 +737 @@
                         return false;
                 }
-                
+
         // User is logged in, so check their last posted time
         } elseif ( !empty( $author_id ) ) {
@@ -1056 +1056 @@
 
 %2$s
-                        
+
 Post Link: %3$s
 
@@ -1064 +1064 @@
 
 Login and visit the topic to unsubscribe from these emails.', 'bbpress' ),
-                                
+
                         $reply_author_name,
                         $reply_content,
@@ -1438 +1438 @@
 function bbp_verify_nonce_request( $action = '', $query_arg = '_wpnonce' ) {
 
-        // Parse home_url() into pieces to remove query-strings, strange characters, 
+        // Parse home_url() into pieces to remove query-strings, strange characters,
         // and other funny things that plugins might to do to it.
         $parsed_home   = parse_url( home_url( '/', ( is_ssl() ? 'https://' : 'http://' ) ) );
@@ -1495 +1495 @@
                                         if ( isset( $query_vars[bbp_get_forum_post_type()] ) ) {
 
-                                                // Get the forum by the path
-                                                $forum    = get_page_by_path( $query_vars[bbp_get_forum_post_type()], OBJECT, bbp_get_forum_post_type() );
-                                                $forum_id = $forum->ID;
-
                                                 // Load up our own query
                                                 query_posts( array(
                                                         'post_type' => bbp_get_forum_post_type(),
-                                                        'ID'        => $forum_id,
+                                                        'name'      => $query_vars[bbp_get_forum_post_type()],
                                                         'feed'      => true
                                                 ) );
@@ -1509 +1505 @@
                                                 $meta_query = array( array(
                                                         'key'     => '_bbp_forum_id',
-                                                        'value'   => $forum_id,
+                                                        'value'   => bbp_get_forum_id(),
                                                         'type'    => 'numeric',
                                                         'compare' => '='
@@ -1541 +1537 @@
                                                         'feed'           => true,
                                                         'post_type'      => bbp_get_topic_post_type(),
-                                                        'post_parent'    => $forum_id,
+                                                        'post_parent'    => bbp_get_forum_id(),
                                                         'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
                                                         'posts_per_page' => bbp_get_topics_per_rss_page(),