Changeset 4255

Timestamp:

10/19/2012 12:50:06 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Topic and Reply Editing:

• Fix issue with "Edit" admin links having 'view=all' argument incorrectly positioned.
• Fix issue with post_status being set back to public when editing.
• Conditionally set post_status to pending if needs moderation.
• Fixes #1977.

Location:

trunk/bbp-includes

Files:

• replies/functions.php (modified) (1 diff)
• replies/template-tags.php (modified) (2 diffs)
• topics/functions.php (modified) (1 diff)
• topics/template-tags.php (modified) (2 diffs)

trunk/bbp-includes/replies/functions.php

@@ -500 +500 @@
     // Maybe put into moderation
     if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
-        $reply_status = bbp_get_pending_status_id();
-
-    // Default
+
+        // Set post status to pending if public
+        if ( bbp_get_public_status_id() == $reply->post_status ) {
+            $reply_status = bbp_get_pending_status_id();
+        }
+
+    // Use existing post_status
     } else {
-        $reply_status = bbp_get_public_status_id();
+        $reply_status = $reply->post_status;
     }
 

trunk/bbp-includes/replies/template-tags.php

@@ -1572 +1572 @@
             return;
 
-        $reply_link = bbp_get_reply_permalink( $reply_id );
+        $reply_link = bbp_remove_view_all( bbp_get_reply_permalink( $reply_id ) );
 
         // Pretty permalinks
@@ -1583 +1583 @@
             $url = add_query_arg( array( bbp_get_reply_post_type() => $reply->post_name, $bbp->edit_id => '1' ), $reply_link );
         }
+
+        // Maybe add view all
+        $url = bbp_add_view_all( $url );
 
         return apply_filters( 'bbp_get_reply_edit_url', $url, $reply_id );

trunk/bbp-includes/topics/functions.php

@@ -556 +556 @@
     // Maybe put into moderation
     if ( !bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
-        $topic_status = bbp_get_pending_status_id();
-
-    // Default to published
+
+        // Set post status to pending if public or closed
+        if ( in_array( $topic->post_status, array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ) ) {
+            $topic_status = bbp_get_pending_status_id();
+        }
+
+    // Use existing post_status
     } else {
-        $topic_status = bbp_get_public_status_id();
+        $topic_status = $topic->post_status;
     }
 

trunk/bbp-includes/topics/template-tags.php

@@ -2300 +2300 @@
             return;
 
-        $topic_link = bbp_get_topic_permalink( $topic_id );
+        // Remove view=all link from edit
+        $topic_link = bbp_remove_view_all( bbp_get_topic_permalink( $topic_id ) );
 
         // Pretty permalinks
@@ -2311 +2312 @@
             $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, $bbp->edit_id => '1' ), $topic_link );
         }
+
+        // Maybe add view=all
+        $url = bbp_add_view_all( $url );
 
         return apply_filters( 'bbp_get_topic_edit_url', $url, $topic_id );