Changeset 5078

Timestamp:

08/19/2013 07:10:14 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bbp_get_topic_types() rather than compare to hardcoded array. Also switch from isset() to !empty() checks, and add an empty() check for 'sub_action' when toggling a topic.

File:

• trunk/includes/topics/functions.php (modified) (4 diffs)

trunk/includes/topics/functions.php

@@ -277 +277 @@
 
     // Check a whitelist of possible topic status ID's
-    } elseif ( isset( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( bbp_get_topic_statuses() ) ) ) {
+    } elseif ( !empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( bbp_get_topic_statuses() ) ) ) {
         $topic_status = $_POST['bbp_topic_status'];
 
@@ -613 +613 @@
 
     // Check a whitelist of possible topic status ID's
-    } elseif ( isset( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( bbp_get_topic_statuses() ) ) ) {
+    } elseif ( !empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( bbp_get_topic_statuses() ) ) ) {
         $topic_status = $_POST['bbp_topic_status'];
 
@@ -721 +721 @@
         /** Stickies **********************************************************/
 
-        if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
+        if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( bbp_get_topic_types() ) ) ) {
 
             // What's the caps?
@@ -2130 +2130 @@
         case 'bbp_toggle_topic_trash' :
 
-            $sub_action = in_array( $_GET['sub_action'], array( 'trash', 'untrash', 'delete' ) ) ? $_GET['sub_action'] : false;
+            $sub_action = !empty( $_GET['sub_action'] ) && in_array( $_GET['sub_action'], array( 'trash', 'untrash', 'delete' ) ) ? $_GET['sub_action'] : false;
 
             if ( empty( $sub_action ) )