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

Timestamp:

07/23/2017 01:26:46 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums, User Notes: After [5659], make sure the dynamic elements of note adding/editing form (post ID and permalink) are still dynamic.

See #2272.

File:

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

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

@@ -63 +63 @@
 
                 // Make sure our nonces are in order.
-                if ( ! bbp_verify_nonce_request( sprintf( 'wporg-bbp-add-user-note_%d_%d', $user_id, $post_id ) ) ) {
+                if ( ! bbp_verify_nonce_request( sprintf( 'wporg-bbp-add-user-note_%d', $user_id ) ) ) {
                         return;
                 }
@@ -290 +290 @@
 
         /**
+         * Retrieves user notes output for a particular user.
+         *
+         * Replaces '###POST_ID###' and '###POST_PERMALINK###' placeholders
+         * in the note adding/editing form with the current post ID and permalink.
+         *
+         * @param int $user_id User ID. Defaults to the current post author.
+         * @return string User notes output.
+         */
+        public function get_user_notes_html( $user_id ) {
+                $user_notes = $this->get_user_notes( $user_id )->html;
+
+                if ( ! bbp_is_single_user_profile() ) {
+                        $post_id = get_the_ID();
+                } else {
+                        $post_id = 0;
+                }
+
+                $post_permalink = $this->get_user_note_post_permalink( $post_id );
+
+                $user_notes = strtr( $user_notes, array(
+                        '###POST_ID###'        => esc_attr( $post_id ),
+                        '###POST_PERMALINK###' => esc_url( $post_permalink ),
+                ) );
+
+                return $user_notes;
+        }
+
+        /**
          * Retrieves permalink to the post associated with a note.
          *
@@ -301 +329 @@
          */
         public function get_user_note_post_permalink( $post_id = 0, $user_id = 0, $site_id = 0 ) {
-                switch_to_blog( $site_id );
+                if ( $site_id ) {
+                        switch_to_blog( $site_id );
+                }
 
                 $post_type = $post_id ? get_post_type( $post_id ) : '';
@@ -321 +351 @@
                 }
 
-                restore_current_blog();
+                if ( $site_id ) {
+                        restore_current_blog();
+                }
 
                 return $permalink;
@@ -334 +366 @@
                 if ( ! $user_id ) {
                         $user_id = get_the_author_meta( 'ID' );
-                }
-
-                if ( ! bbp_is_single_user_profile() ) {
-                        $post_id = get_the_ID();
-                } else {
-                        $post_id = 0;
                 }
 
@@ -354 +380 @@
                         $button_label = esc_html__( 'Add your note', 'wporg-forums' );
                 }
-
-                $post_permalink = $this->get_user_note_post_permalink( $post_id );
                 ?>
-                <form action="<?php echo esc_url( $post_permalink ); ?>" method="post" class="wporg-bbp-add-user-note">
-                        <?php wp_nonce_field( sprintf( 'wporg-bbp-add-user-note_%d_%d', $user_id, $post_id ) ); ?>
+                <form action="###POST_PERMALINK###" method="post" class="wporg-bbp-add-user-note">
+                        <?php wp_nonce_field( sprintf( 'wporg-bbp-add-user-note_%d', $user_id ) ); ?>
                         <input type="hidden" name="action" value="wporg_bbp_add_user_note">
                         <input type="hidden" name="user_id" value="<?php echo esc_attr( $user_id ); ?>">
-                        <input type="hidden" name="post_id" value="<?php echo esc_attr( $post_id ); ?>">
+                        <input type="hidden" name="post_id" value="###POST_ID###">
                         <?php if ( $edit_note ) : ?>
                                 <input type="hidden" name="note_id" value="<?php echo esc_attr( $note_id ); ?>">
@@ -436 +460 @@
                 ?>
                 <div class="<?php echo esc_attr( $class ); ?>" id="wporg-bbp-user-notes-<?php echo esc_attr( $post_id ); ?>">
-                        <?php echo $this->get_user_notes( $user_id )->html; ?>
+                        <?php echo $this->get_user_notes_html( $user_id ); ?>
                 </div>
                 <?php
@@ -464 +488 @@
                         <h2 id="user-notes" class="entry-title"><?php esc_html_e( 'User Notes', 'wporg-forums' ); ?></h2>
                         <div class="bbp-user-section">
-                                <?php echo $this->get_user_notes( $user_id )->html; ?>
+                                <?php echo $this->get_user_notes_html( $user_id ); ?>
                         </div>
                 </div>