Changeset 6415 for trunk/src/includes/topics/functions.php

Timestamp:

05/19/2017 03:25:37 AM (7 years ago)

Author:

johnjamesjacoby

Message:

in_array(): be strict whenever possible.

Use wp_parse_id_list() on certain array values to ensure proper results.

File:

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

trunk/src/includes/topics/functions.php

@@ -296 +296 @@
 
     // Check a whitelist of possible topic status ID's
-    } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ) ) ) {
+    } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ), true ) ) {
         $topic_status = sanitize_key( $_POST['bbp_topic_status'] );
 
@@ -615 +615 @@
 
     // Check a whitelist of possible topic status ID's
-    } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ) ) ) {
+    } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ), true ) ) {
         $topic_status = sanitize_key( $_POST['bbp_topic_status'] );
 
@@ -1122 +1122 @@
 
     // Make sure we're not walking twice
-    if ( ! in_array( $new_forum_id, $old_forum_ancestors ) ) {
+    if ( ! in_array( $new_forum_id, $old_forum_ancestors, true ) ) {
 
         // Get topic ancestors
@@ -1533 +1533 @@
 
     // Invalid split option
-    if ( empty( $split_option ) || ! in_array( $split_option, array( 'existing', 'reply' ) ) ) {
+    if ( empty( $split_option ) || ! in_array( $split_option, array( 'existing', 'reply' ), true ) ) {
         bbp_add_error( 'bbp_split_topic_option', __( '<strong>ERROR</strong>: You need to choose a valid split option.', 'bbpress' ) );
 
@@ -1725 +1725 @@
 
             // Not a reply to a reply that moved over
-            if ( ! in_array( $reply_to, $reply_ids ) ) {
+            if ( ! in_array( $reply_to, $reply_ids, true ) ) {
                 bbp_update_reply_to( $reply->ID, 0 );
             }
@@ -1852 +1852 @@
 
     // Bail if actions aren't meant for this function
-    if ( ! in_array( $action, $possible_actions ) ) {
+    if ( ! in_array( $action, $possible_actions, true ) ) {
         return;
     }
@@ -2087 +2087 @@
     $stickies = ( empty( $stickies ) || ! is_array( $stickies ) )
         ? array()
-        : $stickies;
+        : wp_parse_id_list( $stickies );
 
     // Filter and return
@@ -2110 +2110 @@
     $stickies = ( empty( $stickies ) || ! is_array( $stickies ) )
         ? array()
-        : $stickies;
+        : wp_parse_id_list( $stickies );
 
     // Filter and return
@@ -3654 +3654 @@
     if ( empty( $stickies ) ) {
         $success = true;
-    } elseif ( ! in_array( $topic_id, $stickies ) ) {
+    } elseif ( ! in_array( $topic_id, $stickies, true ) ) {
         $success = true;
     } elseif ( false === $offset ) {