Changeset 4330

Timestamp:

11/06/2016 05:01:16 PM (8 years ago)

Author:

jmdodd

Message:

Support Forums: Move Gravatar suppression to display hooks.

It should be included on Rosetta forums as it is a visual change, not a performance optimization.

Fixes #2001.

Location:

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

Files:

• class-hooks.php (modified) (2 diffs)
• class-performance-optimizations.php (modified) (2 diffs)

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

@@ -12 +12 @@
         add_filter( 'bbp_get_topic_admin_links', array( $this, 'get_admin_links' ), 10, 3 );
         add_filter( 'bbp_get_reply_admin_links', array( $this, 'get_admin_links' ), 10, 3 );
+
+        // Gravatar suppression on lists of topics.
+        add_filter( 'bbp_after_get_topic_author_link_parse_args', array( $this, 'get_author_link' ) );
+        add_filter( 'bbp_after_get_reply_author_link_parse_args', array( $this, 'get_author_link' ) );
 
         // oEmbed.
@@ -33 +37 @@
 
         return $retval;
+    }
+
+    /**
+     * Suppress Gravatars on lists of topics.
+     */
+    public function get_author_link( $r ) {
+        if ( ! bbp_is_single_topic() || bbp_is_topic_edit() ) {
+            $r['type'] = 'name';
+        }
+        return $r;
     }
 

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

@@ -12 +12 @@
         // Remove query to get adjacent posts.
         remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10 );
-
-        // Gravatar suppression on lists of topics.
-        add_filter( 'bbp_after_get_topic_author_link_parse_args', array( $this, 'get_author_link' ) );
-        add_filter( 'bbp_after_get_reply_author_link_parse_args', array( $this, 'get_author_link' ) );
 
         // Filters on pre_get_posts.
@@ -32 +28 @@
         add_action( 'wp_ajax_wp-link-ajax', array( $this, 'disable_wp_link_ajax' ), -1 );
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-    }
-
-    /**
-     * Remove unnecessary Gravatar display on lists of topics.
-     */
-    public function get_author_link( $r ) {
-        if ( ! bbp_is_single_topic() || bbp_is_topic_edit() ) {
-            $r['type'] = 'name';
-        }
-        return $r;
     }