Changeset 5049

Timestamp:

03/02/2017 11:29:27 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Introduce wporg_support_get_compat_views() and wporg_support_is_compat_view() to DRY some conditionals.

Location:

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

Files:

• bbpress/loop-single-topic.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• sidebar.php (modified) (3 diffs)

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

@@ -51 +51 @@
             <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
 
-            <?php if ( ( bbp_is_single_view() && ! in_array( bbp_get_view_id(), array( 'plugin', 'theme', 'reviews', 'active' ) ) ) || ( bbp_is_single_forum() && bbp_get_topic_forum_id() != bbp_get_forum_id() ) || bbp_is_single_user_topics() ) : ?>
+            <?php if ( ( bbp_is_single_view() && ! wporg_support_is_compat_view() ) || ( bbp_is_single_forum() && bbp_get_topic_forum_id() != bbp_get_forum_id() ) || bbp_is_single_user_topics() ) : ?>
 
                 <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>

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

@@ -216 +216 @@
 /**
  * Check if the current page is a single review.
+ *
+ * @bool True if the current page is a single review, false otherwise.
  */
 function wporg_support_is_single_review() {
@@ -223 +225 @@
 
     return ( WordPressdotorg\Forums\Plugin::REVIEWS_FORUM_ID == bbp_get_topic_forum_id() );
+}
+
+/**
+ * Get the list of plugin- and theme-specific views.
+ *
+ * @return array Array of compat views.
+ */
+function wporg_support_get_compat_views() {
+    return array( 'theme', 'plugin', 'reviews', 'active' );
+}
+
+/**
+ * Check if the current page is a plugin- or theme-specific view.
+ *
+ * @param string $view_id View ID to check.
+ * @return bool True if the current page is a compat view, false otherwise.
+ */
+function wporg_support_is_compat_view( $view_id = 0 ) {
+    if ( ! bbp_is_single_view() ) {
+        return false;
+    }
+
+    $view_id = bbp_get_view_id( $view_id );
+
+    return in_array( $view_id, wporg_support_get_compat_views() );
 }
 

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

@@ -36 +36 @@
             </div>
 
-        <?php elseif ( bbp_is_single_view() && in_array( bbp_get_view_id(), array( 'theme', 'plugin', 'reviews', 'active' ) ) ) : ?>
+        <?php elseif ( wporg_support_is_compat_view() ) : ?>
 
             <?php do_action( 'wporg_compat_view_sidebar' ); ?>
@@ -109 +109 @@
 
                     <?php foreach ( bbp_get_views() as $view => $args ) :
-                        if ( in_array( $view, array( 'theme', 'plugin', 'reviews', 'active' ) ) ) {
+                        if ( in_array( $view, wporg_support_get_compat_views() ) ) {
                             continue;
                         }
@@ -123 +123 @@
         <?php endif; ?>
 
-        <?php if ( bbp_is_single_view() && ! in_array( bbp_get_view_id(), array( 'theme', 'plugin', 'reviews', 'active' ) ) || is_tax( 'topic-tag' ) ) : ?>
+        <?php if ( bbp_is_single_view() && ! wporg_support_is_compat_view() || is_tax( 'topic-tag' ) ) : ?>
 
             <div>