Changeset 4042

Timestamp:

07/02/2012 12:39:16 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Akismet:

• Pass additional post information on topic/reply edit, to prevent Akismet from nooping it.
• Revert part of r4041; put actions back before bbp_is_error() calls.
• Replace some missing revision numbers.
• Fixes #1869.

Location:

branches/plugin/bbp-includes

Files:

• bbp-extend-akismet.php (modified) (2 diffs)
• bbp-forum-functions.php (modified) (2 diffs)
• bbp-reply-functions.php (modified) (3 diffs)
• bbp-reply-template.php (modified) (6 diffs)
• bbp-topic-functions.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-extend-akismet.php

@@ -57 +57 @@
         // bbPress functions for spam and ham submissions
         $checks['submit'] = array(
-            'bbp_spammed_topic'        => 10, // Spammed topic
-            'bbp_unspammed_topic'      => 10, // Unspammed reply
-            'bbp_spammed_reply'        => 10, // Spammed reply
-            'bbp_unspammed_reply'      => 10, // Unspammed reply
+            'bbp_spammed_topic'   => 10, // Spammed topic
+            'bbp_unspammed_topic' => 10, // Unspammed reply
+            'bbp_spammed_reply'   => 10, // Spammed reply
+            'bbp_unspammed_reply' => 10, // Unspammed reply
         );
 
@@ -193 +193 @@
      * Submit a post for spamming or hamming
      *
-     * @since bbPress ({unknown})
+     * @since bbPress (r3277)
      *
      * @param int $post_id

branches/plugin/bbp-includes/bbp-forum-functions.php

@@ -229 +229 @@
     /** Additional Actions (Before Save) **************************************/
 
+    do_action( 'bbp_new_forum_pre_extras', $forum_parent_id );
+
     // Bail if errors
     if ( bbp_has_errors() )
@@ -234 +236 @@
 
     /** No Errors *************************************************************/
-
-    do_action( 'bbp_new_forum_pre_extras', $forum_parent_id );
 
     // Add the content of the form to $forum_data as an array

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -228 +228 @@
 
     /** Additional Actions (Before Save) **************************************/
-    
+
+    do_action( 'bbp_new_reply_pre_extras', $topic_id, $forum_id );
+
     // Bail if errors
     if ( bbp_has_errors() )
@@ -234 +236 @@
 
     /** No Errors *************************************************************/
-
-    do_action( 'bbp_new_reply_pre_extras', $topic_id, $forum_id );
 
     // Add the content of the form to $reply_data as an array
@@ -505 +505 @@
         'post_title'   => $reply_title,
         'post_content' => $reply_content,
-        'post_status'  => $post_status
+        'post_status'  => $post_status,
+        'post_parent'  => $reply->post_parent,
+        'post_author'  => $reply->post_author,
+        'post_type'    => bbp_get_reply_post_type()
     ) );
 

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -1878 +1878 @@
  * Output the value of reply content field
  *
- * @since bbPress {unknown}
+ * @since bbPress (r31301)
  *
  * @uses bbp_get_form_reply_content() To get value of reply content field
@@ -1888 +1888 @@
      * Return the value of reply content field
      *
-     * @since bbPress {unknown}
+     * @since bbPress (r31301)
      *
      * @uses bbp_is_reply_edit() To check if it's the reply edit page
@@ -1914 +1914 @@
  * Output checked value of reply log edit field
  *
- * @since bbPress {unknown}
+ * @since bbPress (r31301)
  *
  * @uses bbp_get_form_reply_log_edit() To get the reply log edit value
@@ -1924 +1924 @@
      * Return checked value of reply log edit field
      *
-     * @since bbPress {unknown}
+     * @since bbPress (r31301)
      *
      * @uses apply_filters() Calls 'bbp_get_form_reply_log_edit' with the
@@ -1946 +1946 @@
  * Output the value of the reply edit reason
  *
- * @since bbPress {unknown}
+ * @since bbPress (r31301)
  *
  * @uses bbp_get_form_reply_edit_reason() To get the reply edit reason value
@@ -1956 +1956 @@
      * Return the value of the reply edit reason
      *
-     * @since bbPress {unknown}
+     * @since bbPress (r31301)
      *
      * @uses apply_filters() Calls 'bbp_get_form_reply_edit_reason' with the

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -259 +259 @@
     }
 
+    /** Additional Actions (Before Save) **************************************/
+
+    do_action( 'bbp_new_topic_pre_extras', $forum_id );
+
     // Bail if errors
     if ( bbp_has_errors() )
@@ -264 +268 @@
 
     /** No Errors *************************************************************/
-
-    do_action( 'bbp_new_topic_pre_extras', $forum_id );
 
     // Add the content of the form to $topic_data as an array.
@@ -574 +576 @@
     /** No Errors *************************************************************/
 
-    /** Stickies **********************************************************/
-
-    if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
-
-        // What's the dilly?
-        switch ( $_POST['bbp_stick_topic'] ) {
-
-            // Sticky in forum
-            case 'stick'   :
-                bbp_stick_topic( $topic_id );
-                break;
-
-            // Sticky in all forums
-            case 'super'   :
-                bbp_stick_topic( $topic_id, true );
-                break;
-
-            // Normal
-            case 'unstick' :
-            default        :
-                bbp_unstick_topic( $topic_id );
-                break;
-        }
-    }
-
-    /** Update the topic ******************************************************/
-
     // Add the content of the form to $topic_data as an array
     // Just in time manipulation of topic data before being edited
@@ -609 +584 @@
         'post_status'  => $post_status,
         'post_parent'  => $forum_id,
+        'post_author'  => $topic->post_author,
+        'post_type'    => bbp_get_topic_post_type(),
         'tax_input'    => $terms,
     ) );
@@ -614 +591 @@
     // Insert topic
     $topic_id = wp_update_post( $topic_data );
+
+    /** Stickies **************************************************************/
+
+    if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
+
+        // What's the dilly?
+        switch ( $_POST['bbp_stick_topic'] ) {
+
+            // Sticky in forum
+            case 'stick'   :
+                bbp_stick_topic( $topic_id );
+                break;
+
+            // Sticky in all forums
+            case 'super'   :
+                bbp_stick_topic( $topic_id, true );
+                break;
+
+            // Normal
+            case 'unstick' :
+            default        :
+                bbp_unstick_topic( $topic_id );
+                break;
+        }
+    }
 
     /** Revisions *************************************************************/