Changeset 4322

Timestamp:

11/03/2012 09:48:33 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Pagination:

• Fix bug where topics started, favorites, and subscriptions pagination would link to the root of a users profile.\
• Fixes incorrect filters on topics and replies URL's.

Location:

trunk/includes

Files:

• topics/template-tags.php (modified) (1 diff)
• users/template-tags.php (modified) (4 diffs)

trunk/includes/topics/template-tags.php

@@ -240 +240 @@
         if ( $wp_rewrite->using_permalinks() ) {
 
-            // Profile page
-            if ( bbp_is_single_user() ) {
+            // User's topics
+            if ( bbp_is_single_user_topics() ) {
+                $base = bbp_get_user_topics_created_url( bbp_get_displayed_user_id() );
+
+            // User's favorites
+            } elseif ( bbp_is_favorites() ) {
+                $base = bbp_get_favorites_permalink( bbp_get_displayed_user_id() );
+
+            // User's subscriptions
+            } elseif ( bbp_is_subscriptions() ) {
+                $base = bbp_get_subscriptions_permalink( bbp_get_displayed_user_id() );
+
+            // Root profile page
+            } elseif ( bbp_is_single_user() ) {
                 $base = bbp_get_user_profile_url( bbp_get_displayed_user_id() );
-
-            // User's replies
-            } elseif ( bbp_is_single_user_topics() ) {
-                $base = bbp_get_user_topics_created_url( bbp_get_displayed_user_id() );
 
             // View

trunk/includes/users/template-tags.php

@@ -1076 +1076 @@
         // Pretty permalinks
         if ( $wp_rewrite->using_permalinks() ) {
-            $url = $wp_rewrite->root . bbp_get_user_slug() . '/%' . bbp_get_user_rewrite_id() . '%/topics';
+            $url  = $wp_rewrite->root . bbp_get_user_slug() . '/%' . bbp_get_user_rewrite_id() . '%/topics';
             $user = get_userdata( $user_id );
             if ( ! empty( $user->user_nicename ) ) {
@@ -1089 +1089 @@
         } else {
             $url = add_query_arg( array(
-                bbp_get_user_rewrite_id() => $user_id,
-                bbp_get_topic_post_type() => 'topics',
+                bbp_get_user_rewrite_id()        => $user_id,
+                bbp_get_user_topics_rewrite_id() => '1',
             ), home_url( '/' ) );
         }
 
-        return apply_filters( 'bbp_get_favorites_permalink', $url, $user_id );
+        return apply_filters( 'bbp_get_user_topics_created_url', $url, $user_id );
     }
 
@@ -1136 +1136 @@
         // Pretty permalinks
         if ( $wp_rewrite->using_permalinks() ) {
-            $url = $wp_rewrite->root . bbp_get_user_slug() . '/%' . bbp_get_user_rewrite_id() . '%/replies';
+            $url  = $wp_rewrite->root . bbp_get_user_slug() . '/%' . bbp_get_user_rewrite_id() . '%/replies';
             $user = get_userdata( $user_id );
             if ( ! empty( $user->user_nicename ) ) {
@@ -1149 +1149 @@
         } else {
             $url = add_query_arg( array(
-                bbp_get_user_rewrite_id() => $user_id,
-                bbp_get_topic_post_type() => 'replies',
+                bbp_get_user_rewrite_id()         => $user_id,
+                bbp_get_user_replies_rewrite_id() => '1',
             ), home_url( '/' ) );
         }
 
-        return apply_filters( 'bbp_get_user_topics_created_url', $url, $user_id );
+        return apply_filters( 'bbp_get_user_replies_created_url', $url, $user_id );
     }