Changeset 5646 for sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php

Timestamp:

07/11/2017 03:28:02 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Store site ID in addition to post ID associated with a note, as post IDs are not unique across Rosetta forums.

See #2272.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php (modified) (4 diffs)

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

@@ -100 +100 @@
                         'date'      => current_time( 'mysql' ),
                         'post_id'   => $post_id,
+                        'site_id'   => get_current_blog_id(),
                         'moderator' => wp_get_current_user()->user_nicename
                 );
@@ -212 +213 @@
          *
          * @param int $post_id Post ID. Default 0.
-         * @param int $user_id User ID. Defaults to the current post author.
+         * @param int $user_id User ID. Default 0.
+         * @param int $site_id Site ID. Default 0.
          * @return string Post permalink or user profile URL.
          */
-        function get_user_note_post_permalink( $post_id = 0, $user_id = 0 ) {
+        function get_user_note_post_permalink( $post_id = 0, $user_id = 0, $site_id = 0 ) {
+                switch_to_blog( $site_id );
+
                 $post_type = $post_id ? get_post_type( $post_id ) : '';
 
@@ -228 +232 @@
                 }
 
+                restore_current_blog();
+
                 return $permalink;
         }
@@ -250 +256 @@
                         }
 
-                        $post_permalink     = $this->get_user_note_post_permalink( $note->post_id, $user_id );
-                        $redirect_on_delete = $this->get_user_note_post_permalink( get_the_ID(), $user_id );
+                        $post_site_id       = isset( $note->site_id ) ? (int) $note->site_id : get_current_blog_id();
+                        $post_permalink     = $this->get_user_note_post_permalink( $note->post_id, $user_id, $post_site_id );
+                        $redirect_on_delete = $this->get_user_note_post_permalink( get_the_ID(), $user_id, get_current_blog_id() );
 
                         printf( '<div class="bbp-template-notice warning"><p>%s</p> %s</div>' . "\n",