Changeset 12410

Timestamp:

02/21/2023 05:48:06 AM (20 months ago)

Author:

dd32

Message:

Support Forums: Setup the Directory_Compat classes in the context of the topic when processing email subscriptions for pending/delayed topics.

See #6786.

Location:

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

Files:

• class-directory-compat.php (modified) (3 diffs)
• class-emails.php (modified) (2 diffs)
• class-plugin-directory-compat.php (modified) (1 diff)
• class-theme-directory-compat.php (modified) (1 diff)

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

@@ -19 +19 @@
     abstract protected function name();
     abstract protected function parse_query();
+    abstract protected function for_slug( $slug );
     abstract protected function do_view_sidebar();
     abstract protected function do_topic_sidebar();
@@ -68 +69 @@
 
         }
+    }
+
+    /**
+     * Maybe load the data for this compat directory class.
+     *
+     * @param int $topic_id The topic ID that we should initialize in the context of.
+     */
+    public function init_for_topic( $topic_id ) {
+        $forum_id = bbp_get_topic_forum_id( $topic_id );
+        if ( $forum_id != $this->forum_id() ) {
+            return;
+        }
+
+        $terms = get_the_terms( $topic_id, $this->taxonomy() );
+        if ( ! $terms ) {
+            return;
+        }
+
+        $this->for_slug( $terms[0]->slug );
     }
 
@@ -828 +848 @@
         // Note: Not using $this->title() here so as to filter other terms of this taxonomy correctly.
 
-        $term->name = $this->get_object( $term->slug )->post_title ?? $term->name;
+        if ( ! is_admin() ) {
+            $term->name = $this->get_object( $term->slug )->post_title ?? $term->name;
+        }
 
         return $term;

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

@@ -169 +169 @@
         $topic_author = bbp_get_topic_author_id( $topic_id );
 
+        // Setup the forum compat classes, as used by email filters for subject changes.
+        $forums = Plugin::get_instance();
+        if ( $forums->plugins ) {
+            $forums->plugins->init_for_topic( $topic_id );
+            $forums->themes->init_for_topic( $topic_id );
+        }
+
         // For performance reasons, we've removed the bbPress bbp_update_topic() method, and replaced it with our slightly altered variant.
         $bbp_update_topic = [ Plugin::get_instance()->dropin, 'bbp_update_topic' ];
@@ -203 +210 @@
         }
 
+        // Setup the forum compat classes, as used by email filters for subject changes.
+        $forums = Plugin::get_instance();
+        if ( $forums->plugins ) {
+            $forums->plugins->init_for_topic( $topic_id );
+            $forums->themes->init_for_topic( $topic_id );
+        }
+
         // For performance reasons, we've removed the bbPress bbp_update_reply() method, and replaced it with our slightly altered variant.
         $bbp_update_reply = [ Plugin::get_instance()->dropin, 'bbp_update_reply' ];

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

@@ -91 +91 @@
         }
 
+        if ( ! $this->for_slug( $slug ) ) {
+            status_header( 404 );
+        }
+    }
+
+    /**
+     * Set the directory instance to the slugs data.
+     *
+     * @param string $slug The plugin slug.
+     */
+    public function for_slug( $slug ) {
         $plugin = $this->get_object( $slug );
         if ( ! $plugin ) {
-            status_header( 404 );
-            return;
+            return false;
         }
 

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

@@ -91 +91 @@
         }
 
+        if ( ! $this->for_slug( $slug ) ) {
+            status_header( 404 );
+        }
+    }
+
+    /**
+     * Set the directory instance to the slugs data.
+     *
+     * @param string $slug The theme slug.
+     */
+    public function for_slug( $slug ) {
         $theme = $this->get_object( $slug );
         if ( ! $theme ) {
-            status_header( 404 );
-            return;
+            return false;
         }