Changeset 3506

Timestamp:

09/11/2011 07:13:19 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Update remaining 'spam' and 'trash' post_status references to use _get_ functions.

Location:

branches/plugin

Files:

• bbp-admin/bbp-functions.php (modified) (1 diff)
• bbp-admin/bbp-replies.php (modified) (2 diffs)
• bbp-admin/bbp-topics.php (modified) (2 diffs)
• bbp-includes/bbp-reply-template.php (modified) (2 diffs)
• bbp-includes/bbp-topic-functions.php (modified) (1 diff)

branches/plugin/bbp-admin/bbp-functions.php

@@ -280 +280 @@
         return array( 1, sprintf( $statement, $result ) );
 
-    $sql = "INSERT INTO `{$wpdb->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` IN ( '" . join( "','", array( 'trash', bbp_get_spam_status_id() ) ) . "') GROUP BY `post_parent`);";
+    $sql = "INSERT INTO `{$wpdb->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` IN ( '" . join( "','", array( bbp_get_trash_status_id(), bbp_get_spam_status_id() ) ) . "') GROUP BY `post_parent`);";
     if ( is_wp_error( $wpdb->query( $sql ) ) )
         return array( 2, sprintf( $statement, $result ) );

branches/plugin/bbp-admin/bbp-replies.php

@@ -674 +674 @@
 
             // User cannot view replies in trash
-            if ( ( 'trash' == $reply->post_status ) && !current_user_can( 'view_trash' ) )
+            if ( ( bbp_get_trash_status_id() == $reply->post_status ) && !current_user_can( 'view_trash' ) )
                 unset( $actions['view'] );
 
@@ -732 +732 @@
 
         // Add Empty Spam button
-        if ( !empty( $_GET['post_status'] ) && ( 'spam' == $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
+        if ( !empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() == $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
             $title = esc_attr__( 'Empty Spam', 'bbpress' );

branches/plugin/bbp-admin/bbp-topics.php

@@ -726 +726 @@
 
             // Show view link if it's not set, the topic is trashed and the user can view trashed topics
-            if ( empty( $actions['view'] ) && 'trash' == $topic->post_status && current_user_can( 'view_trash' ) )
+            if ( empty( $actions['view'] ) && ( bbp_get_trash_status_id() == $topic->post_status ) && current_user_can( 'view_trash' ) )
                 $actions['view'] = '<a href="' . bbp_get_topic_permalink( $topic->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;', 'bbpress' ), bbp_get_topic_title( $topic->ID ) ) ) . '" rel="permalink">' . __( 'View', 'bbpress' ) . '</a>';
 
@@ -807 +807 @@
 
         // Add Empty Spam button
-        if ( !empty( $_GET['post_status'] ) && ( 'spam' == $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
+        if ( !empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() == $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
             $title = esc_attr__( 'Empty Spam', 'bbpress' );

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

@@ -84 +84 @@
         // What are the default allowed statuses (based on user caps)
         if ( bbp_get_view_all( 'edit_others_replies' ) ) {
-            $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), 'trash' ) );
+            $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
         }
     }
@@ -1380 +1380 @@
 
             // Trash link shouldn't be visible on spam topics
-            elseif ( isset( $r['links']['trash'] ) && $reply_status == bbp_get_spam_status_id() )
+            elseif ( isset( $r['links']['trash'] ) && ( bbp_get_spam_status_id() == $reply_status ) )
                 unset( $r['links']['trash'] );
         }

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

@@ -2717 +2717 @@
 
     // Valid topic/reply statuses
-    $post_stati = join( ',', array( bbp_get_public_status_id(), bbp_get_spam_status_id(), 'trash' ) );
+    $post_stati = join( ',', array( bbp_get_public_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
 
     // Topic is being permanently deleted, so its replies gotta go too