Changeset 5058

Timestamp:

03/03/2017 06:13:42 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Introduce Directory_Compat::compat_views() to consolidate some conditionals.

See #2174.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc

Files:

• class-directory-compat.php (modified) (9 diffs)
• class-plugin-directory-compat.php (modified) (3 diffs)
• class-theme-directory-compat.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -6 +6 @@
 
         abstract protected function compat();
+        abstract protected function compat_views();
         abstract protected function compat_title();
         abstract protected function reviews_title();
-        abstract protected function activity_title();
+        abstract protected function active_title();
         abstract protected function slug();
         abstract protected function title();
@@ -110 +111 @@
 
                         // Compat views are hooked in a special order, and need help with feed queries.
-                        if ( isset( $query_vars['bbp_view'] ) && in_array( $query_vars['bbp_view'], array( $this->compat(), 'reviews', 'active' ) ) ) {
+                        if ( isset( $query_vars['bbp_view'] ) && in_array( $query_vars['bbp_view'], $this->compat_views() ) ) {
                                 $this->query = $query_vars;
                                 add_filter( 'bbp_get_view_query_args', array( $this, 'get_view_query_args_for_feed' ), 10, 2 );
@@ -173 +174 @@
 
                 switch ( $this->query['bbp_view'] ) {
-                        case 'plugin':
-                        case 'theme':
+                        case $this->compat():
                                 $translation = $this->compat_title();
                                 break;
@@ -181 +181 @@
                                 break;
                         case 'active':
-                                $translation = $this->activity_title();
+                                $translation = $this->active_title();
                                 break;
                 }
@@ -345 +345 @@
                         ( bbp_is_single_forum() && Plugin::REVIEWS_FORUM_ID == bbp_get_forum_id() )
                 ||
-                        ( bbp_is_single_view() && ! in_array( bbp_get_view_id(), array( 'plugin', 'theme', 'reviews', 'active' ) ) )
+                        ( bbp_is_single_view() && ! in_array( bbp_get_view_id(), $this->compat_views() ) )
                 ) {
                         $terms = get_the_terms( $topic_id, $this->taxonomy() );
@@ -448 +448 @@
                 bbp_register_view(
                         'active',
-                        $this->activity_title(),
+                        $this->active_title(),
                         array(
                                 'post_parent'   => $this->forum_id(),
@@ -469 +469 @@
 
                 $view = bbp_get_view_id( $view );
-                if ( ! in_array( $view, array( 'active', 'reviews', $this->compat() ) ) ) {
+                if ( ! in_array( $view, $this->compat_views() ) ) {
                         return $url;
                 }
@@ -476 +476 @@
                 if ( $wp_rewrite->using_permalinks() ) {
                         switch ( $view ) {
+                                case 'reviews' :
                                 case 'active' :
-                                case 'reviews' :
                                         $url = $wp_rewrite->root . $this->compat() . '/' . $this->slug() . '/' . $view;
                                         break;
@@ -507 +507 @@
 
                 $view = bbp_get_view_id();
-                if ( ! in_array( $view, array( $this->compat(), 'reviews', 'active' ) ) ) {
+                if ( ! in_array( $view, $this->compat_views() ) ) {
                         return $r;
                 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php

@@ -14 +14 @@
         }
 
+        function compat_views() {
+                return array( self::COMPAT, 'reviews', 'active' );
+        }
+
         function compat_title() {
                 /* translators: %s: plugin title */
@@ -24 +28 @@
         }
 
-        function activity_title() {
+        function active_title() {
                 /* translators: %s: plugin title */
                 return sprintf( _x( '[%s] Recent Activity', 'plugin', 'wporg-forums' ), $this->title() );
@@ -87 +91 @@
                 $faq     = sprintf( '<a href="//wordpress.org/plugins/%s/faq/">%s</a>', esc_attr( $this->slug() ), __( 'Frequently Asked Questions', 'wporg-forums' ) );
                 $support = sprintf( '<a href="//wordpress.org/support/plugin/%s/">%s</a>', esc_attr( $this->slug() ), __( 'Support Threads', 'wporg-forums' ) );
-                $active  = sprintf( '<a href="//wordpress.org/support/plugin/%s/active">%s</a>', esc_attr( $this->slug() ), __( 'Active Topics', 'wporg-forums' ) );
+                $active  = sprintf( '<a href="//wordpress.org/support/plugin/%s/active/">%s</a>', esc_attr( $this->slug() ), __( 'Active Topics', 'wporg-forums' ) );
                 $reviews = sprintf( '<a href="//wordpress.org/support/plugin/%s/reviews/">%s</a>', esc_attr( $this->slug() ), __( 'Reviews', 'wporg-forums' ) );
                 $create  = '';

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-theme-directory-compat.php

@@ -14 +14 @@
         }
 
+        function compat_views() {
+                return array( self::COMPAT, 'reviews', 'active' );
+        }
+
         function compat_title() {
                 /* translators: %s: theme title */
@@ -24 +28 @@
         }
 
-        function activity_title() {
+        function active_title() {
                 /* translators: %s: theme title */
                 return sprintf( _x( '[%s] Recent Activity', 'theme', 'wporg-forums' ), $this->title() );
@@ -82 +86 @@
                 $theme   = sprintf( '<a href="//wordpress.org/themes/%s/">%s</a>', esc_attr( $this->slug() ), esc_html( $this->theme->post_title ) );
                 $support = sprintf( '<a href="//wordpress.org/support/theme/%s/">%s</a>', esc_attr( $this->slug() ), __( 'Support Threads', 'wporg-forums' ) );
-                $active  = sprintf( '<a href="//wordpress.org/support/theme/%s/active">%s</a>', esc_attr( $this->slug() ), __( 'Active Topics', 'wporg-forums' ) );
+                $active  = sprintf( '<a href="//wordpress.org/support/theme/%s/active/">%s</a>', esc_attr( $this->slug() ), __( 'Active Topics', 'wporg-forums' ) );
                 $reviews = sprintf( '<a href="//wordpress.org/support/theme/%s/reviews/">%s</a>', esc_attr( $this->slug() ), __( 'Reviews', 'wporg-forums' ) );
                 $create  = '';