Ticket #1763: 1763.2.patch

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

@@ -495 +495 @@
                 ) );
 
                 // Add the browse/* views.
-                add_rewrite_tag( '%browse%', '(featured|popular|beta|blocks|new|favorites)' );
+                add_rewrite_tag( '%browse%', '(featured|popular|beta|blocks|new|favorites|adopt-me)' );
                 add_permastruct( 'browse', 'browse/%browse%' );
 
                 // Create an archive for a users favorites too.
@@ -731 +731 @@
 
                 // For any invalid values passed to browse, set it to featured instead
                 if ( !empty ( $wp_query->query ['browse'] ) &&
-                     !in_array( $wp_query->query['browse'], array( 'featured','popular','beta','blocks','new','favorites' ) ) ) {
+                     !in_array( $wp_query->query['browse'], array( 'featured','popular','beta','blocks','new','favorites','adopt-me' ) ) ) {
                          $wp_query->query['browse'] = 'featured';
                          $wp_query->query_vars['browse'] = 'featured';
                 }
@@ -775 +775 @@
                 }
 
                 // For /browse/ requests, we conditionally need to avoid querying the taxonomy for most views (as it's handled in code above)
-                if ( isset( $wp_query->query['browse'] ) && ! in_array( $wp_query->query['browse'], array( 'beta', 'blocks', 'featured' ) ) ) {
+                if ( isset( $wp_query->query['browse'] ) && ! in_array( $wp_query->query['browse'], array( 'beta', 'blocks', 'featured', 'adopt-me' ) ) ) {
                         unset( $wp_query->query_vars['browse'] );
 
                         add_filter( 'the_posts', function( $posts, $wp_query ) {

wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -123 +123 @@
 
                 if ( in_array( 'adopt-me', $readme->tags ) ) {
                         wp_set_object_terms( $plugin->ID, 'adopt-me', 'plugin_section' );
+                } else {
+                        wp_remove_object_terms( $plugin->ID, 'adopt-me', 'plugin_section' );
                 }
 
                 // Update the tested-up-to value

wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php

@@ -14 +14 @@
         'after_title'  => '</h4>',
 );
 
-//the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Ratings', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Support', array(), $widget_args );

wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar.php

@@ -14 +14 @@
         'after_title'  => '</h3>',
 );
 
-//the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Adopt_Me', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Ratings', array(), $widget_args );
 the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Contributors', array(), array(