Ticket #3503: 3503.patch

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

@@ -73 +73 @@
                 $plugin = $this->get_object( $slug );
                 if ( ! $plugin ) {
                         return;
-                } else {
-                        $this->slug         = $slug;
-                        $this->plugin       = $plugin;
-                        $this->authors      = $this->get_authors( $slug );
-                        $this->contributors = $this->get_contributors( $slug );
-                        $this->support_reps = $this->get_support_reps( $slug );
                 }
+
+                $this->slug         = $slug;
+                $this->plugin       = $plugin;
+                $this->authors      = $this->get_authors( $slug );
+                $this->contributors = $this->get_contributors( $slug );
+                $this->support_reps = $this->get_support_reps( $slug );
         }
 
         public function do_view_sidebar() {
@@ -89 +89 @@
         }
 
         public function do_topic_sidebar() {
-                if ( file_exists( WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php' ) ) {
-                        include_once WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php';
+                if ( file_exists( WPORGPATH . 'wp-content/plugins/plugin-directory/class-template.php' ) ) {
+                        include_once WPORGPATH . 'wp-content/plugins/plugin-directory/class-template.php';
                 }
 
                 $icon       = '';
@@ -102 +102 @@
                 $reviews    = sprintf( '<a href="%s">%s</a>', home_url( '/plugin/' . esc_attr( $this->slug() ) . '/reviews/' ), __( 'Reviews', 'wporg-forums' ) );
                 $create     = '';
 
-                if ( function_exists( 'wporg_get_plugin_icon' ) ) {
-                        $icon = wporg_get_plugin_icon( $this->slug, 128 );
+                if ( defined( 'WPORG_PLUGIN_DIRECTORY_BLOGID' ) && class_exists( '\WordPressdotorg\Plugin_Directory\Template' ) ) {
+                        switch_to_blog( WPORG_PLUGIN_DIRECTORY_BLOGID );
+                        $icon = \WordPressdotorg\Plugin_Directory\Template::get_plugin_icon( $this->plugin, 'html' );
+                        restore_current_blog();
                 }
 
                 $create_label = '';