Changeset 5107 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-posts.php

Timestamp:

03/07/2017 02:48:20 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Introduce wporg_support_maybe_add_view_all() and simplify the logic in loop-posts.php.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-posts.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-posts.php

@@ -7 +7 @@
  * @subpackage Theme
  */
-
-$is_moderator_view = class_exists( '\WordPressdotorg\Forums\Moderators' )
-                && defined( '\WordPressdotorg\Forums\Moderators::VIEWS' )
-                && in_array( bbp_get_view_id(), \WordPressdotorg\Forums\Moderators::VIEWS );
 
 ?>
@@ -25 +21 @@
                         <span class="bbp-header">
                             <?php esc_html_e( 'Forum:', 'wporg-forums' ); ?>
-                            <a class="bbp-forum-permalink" href="<?php
-                                $forum_url = bbp_get_forum_permalink( bbp_get_topic_forum_id() );
-                                if ( $is_moderator_view ) {
-                                    $forum_url = add_query_arg( 'view', 'all', $forum_url );
-                                }
-                                echo esc_url( $forum_url );
-                            ?>"><?php bbp_forum_title( bbp_get_topic_forum_id() ); ?></a><br />
+                            <a class="bbp-forum-permalink" href="<?php bbp_forum_permalink( bbp_get_topic_forum_id() ); ?>"><?php bbp_forum_title( bbp_get_topic_forum_id() ); ?></a><br />
+
                             <?php esc_html_e( 'As the topic:', 'wporg-forums' ); ?>
-                            <a class="bbp-topic-permalink" href="<?php
-                                $topic_url = bbp_get_topic_permalink( bbp_get_topic_id() );
-                                if ( $is_moderator_view ) {
-                                    $topic_url = add_query_arg( 'view', 'all', $topic_url );
-                                }
-                                echo esc_url( $topic_url );
-                            ?>"><?php bbp_topic_title( bbp_get_topic_id() ); ?></a>
+                            <a class="bbp-topic-permalink" href="<?php bbp_topic_permalink( bbp_get_topic_id() ); ?>"><?php bbp_topic_title( bbp_get_topic_id() ); ?></a>
                         </span>
                     </div><!-- .bbp-meta -->
@@ -53 +38 @@
                         <span class="bbp-header">
                             <?php esc_html_e( 'Forum:', 'wporg-forums' ); ?>
-                            <a class="bbp-forum-permalink" href="<?php
-                                $forum_url = bbp_get_forum_permalink( bbp_get_reply_forum_id() );
-                                if ( $is_moderator_view ) {
-                                    $forum_url = add_query_arg( 'view', 'all', $forum_url );
-                                }
-                                echo esc_url( $forum_url );
-                            ?>"><?php bbp_forum_title( bbp_get_reply_forum_id() ); ?></a><br />
+                            <a class="bbp-forum-permalink" href="<?php bbp_forum_permalink( bbp_get_reply_forum_id() ); ?>"><?php bbp_forum_title( bbp_get_reply_forum_id() ); ?></a><br />
+
                             <?php esc_html_e( 'In reply to:', 'wporg-forums' ); ?>
-                            <a class="bbp-topic-permalink" href="<?php
-                                $topic_url = bbp_get_topic_permalink( bbp_get_reply_topic_id() );
-                                if ( $is_moderator_view ) {
-                                    $topic_url = add_query_arg( 'view', 'all', $topic_url );
-                                }
-                                echo esc_url( $topic_url );
-                            ?>"><?php bbp_topic_title( bbp_get_reply_topic_id() ); ?></a>
+                            <a class="bbp-topic-permalink" href="<?php bbp_topic_permalink( bbp_get_reply_topic_id() ); ?>"><?php bbp_topic_title( bbp_get_reply_topic_id() ); ?></a>
                         </span>
                     </div><!-- .bbp-meta -->