Changeset 9016

Timestamp:

07/02/2019 05:49:32 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Reviews: Don't attempt to translate review titles/content, and switch to the Support Forums blog to ensure that template functions work as expected for Reviews.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-directory.php (modified) (3 diffs)
• shortcodes/class-reviews.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -969 +969 @@
             return $content;
         }
-        return Plugin_I18n::instance()->translate( $section, $content, [ 'post_id' => $post_id ] );
+
+        $post = get_post( $post_id );
+
+        // Only translate Plugin post objects
+        if ( $post && 'plugin' === $post->post_type ) {
+            return Plugin_I18n::instance()->translate( $section, $content, [ 'post_id' => $post_id ] );
+        }
+
+        return $content;
     }
 
@@ -982 +990 @@
         $post = get_post( $post_id );
 
-        // The $post_id passed may be a Support Forum post ID, which thankfully is much higher than plugins ID's for now.
-        if ( $post instanceof \WP_Post ) {
-            $title = Plugin_I18n::instance()->translate( 'title', $title, [ 'post_id' => $post ] );
+        // Only translate Post type items.
+        if ( $post && $post->post_type === 'plugin' ) {
+            return Plugin_I18n::instance()->translate( 'title', $title, [ 'post_id' => $post ] );
         }
 
@@ -998 +1006 @@
      */
     public function translate_post_excerpt( $excerpt, $post ) {
-        return Plugin_I18n::instance()->translate( 'excerpt', $excerpt, [ 'post_id' => $post ] );
+        $post = get_post( $post );
+
+        // Only translate Post type items.
+        if ( $post && $post->post_type === 'plugin' ) {
+            return Plugin_I18n::instance()->translate( 'excerpt', $excerpt, [ 'post_id' => $post ] );
+        }
+
+        return $excerpt;
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-reviews.php

@@ -29 +29 @@
         <div class="plugin-reviews">
             <?php
-            foreach ( $reviews as $review ) :
+            // Switch to the Support Forum so that Template functions that call get_post() work as intended.
+            if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+                switch_to_blog( WPORG_SUPPORT_FORUMS_BLOGID );
+            }
+
+            foreach ( $reviews as $review ) {
+                $GLOBALS['post'] = $review; // Override the_post();
                 setup_postdata( $review );
                 ?>
@@ -44 +50 @@
                     </div>
                 </article>
-            <?php endforeach; ?>
+            <?php
+            }
+
+            // Reset back to the plugin post.
+            wp_reset_postdata();
+            if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+                restore_current_blog();
+            }
+        ?>
         </div>
-        <?php wp_reset_postdata(); ?>
 
         <a class="reviews-link" href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . get_post()->post_name . '/reviews/' ); ?>">