Changeset 4955

Timestamp:

02/20/2017 09:29:40 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Display Views menu in single forums, plugin- and theme-specific views, and single topics to ensure consistent navigation.

Feeds menu and tag cloud are only displayed in single views (excluding plugin- and theme-specific views) and tag archives, as before.

Fixes #1873.

File:

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

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar.php

@@ -88 +88 @@
             <?php endif; ?>
 
-        <?php elseif ( ! bbp_is_single_user() ) : ?>
+        <?php elseif ( is_tax( 'topic-tag' ) ) : ?>
 
             <?php
                 $term_subscription = '';
-                if ( is_tax( 'topic-tag' ) && function_exists( 'WordPressdotorg\Forums\Term_Subscription\get_subscription_link' ) ) {
+                if ( function_exists( 'WordPressdotorg\Forums\Term_Subscription\get_subscription_link' ) ) {
                     $term_subscription = WordPressdotorg\Forums\Term_Subscription\get_subscription_link( get_queried_object()->term_id );
                 }
@@ -99 +99 @@
                 }
             ?>
+
+        <?php endif; ?>
+
+        <?php if ( ! bbp_is_single_user() ) : ?>
+
             <div>
                 <h4><?php _e( 'Views', 'wporg-forums' ); ?></h4>
                 <ul class="topic-views">
 
-                    <?php foreach ( bbp_get_views() as $view => $args ) : ?>
+                    <?php foreach ( bbp_get_views() as $view => $args ) :
+                        if ( in_array( $view, array( 'theme', 'plugin', 'reviews', 'active' ) ) ) {
+                            continue;
+                        }
+                        ?>
 
                         <li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
@@ -111 +120 @@
                 </ul>
             </div>
+
+        <?php endif; ?>
+
+        <?php if ( bbp_is_single_view() && ! in_array( bbp_get_view_id(), array( 'theme', 'plugin', 'reviews', 'active' ) ) || is_tax( 'topic-tag' ) ) : ?>
 
             <div>