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

Timestamp:

05/19/2017 03:25:37 AM (9 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/forums/functions.php (modified) (11 diffs)

trunk/src/includes/forums/functions.php

@@ -643 +643 @@
     /** Forum Status **********************************************************/
 
-    if ( ! empty( $_POST['bbp_forum_status'] ) && in_array( $_POST['bbp_forum_status'], array( 'open', 'closed' ) ) ) {
+    if ( ! empty( $_POST['bbp_forum_status'] ) && in_array( $_POST['bbp_forum_status'], array( 'open', 'closed' ), true ) ) {
         if ( 'closed' === $_POST['bbp_forum_status'] && ! bbp_is_forum_closed( $forum_id, false ) ) {
             bbp_close_forum( $forum_id );
@@ -655 +655 @@
     /** Forum Type ************************************************************/
 
-    if ( ! empty( $_POST['bbp_forum_type'] ) && in_array( $_POST['bbp_forum_type'], array( 'forum', 'category' ) ) ) {
+    if ( ! empty( $_POST['bbp_forum_type'] ) && in_array( $_POST['bbp_forum_type'], array( 'forum', 'category' ), true ) ) {
         if ( 'category' === $_POST['bbp_forum_type'] && ! bbp_is_forum_category( $forum_id ) ) {
             bbp_categorize_forum( $forum_id );
@@ -667 +667 @@
     /** Forum Visibility ******************************************************/
 
-    if ( ! empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array_keys( bbp_get_forum_visibilities() ) ) ) {
+    if ( ! empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array_keys( bbp_get_forum_visibilities() ), true ) ) {
 
         // Get forums current visibility
@@ -860 +860 @@
 
     // Find this forum in the array
-    if ( in_array( $forum_id, $private ) ) {
+    if ( in_array( $forum_id, $private, true ) ) {
 
         $offset = array_search( $forum_id, $private );
@@ -875 +875 @@
 
     // Find this forum in the array
-    if ( in_array( $forum_id, $hidden ) ) {
+    if ( in_array( $forum_id, $hidden, true ) ) {
 
         $offset = array_search( $forum_id, $hidden );
@@ -921 +921 @@
 
         // Find this forum in the array
-        if ( in_array( $forum_id, $hidden ) ) {
+        if ( in_array( $forum_id, $hidden, true ) ) {
 
             $offset = array_search( $forum_id, $hidden );
@@ -971 +971 @@
 
         // Find this forum in the array
-        if ( in_array( $forum_id, $private ) ) {
+        if ( in_array( $forum_id, $private, true ) ) {
 
             $offset = array_search( $forum_id, $private );
@@ -2047 +2047 @@
  *
  * @uses get_option() Returns the unserialized array of hidden forum ids
+ * @uses wp_parse_id_list() Make sure array items are ints
  * @uses apply_filters() Calls 'bbp_forum_query_topic_ids' with the topic ids
  *                        and forum id
@@ -2052 +2053 @@
 function bbp_get_hidden_forum_ids() {
     $forum_ids = get_option( '_bbp_hidden_forums', array() );
+    $forum_ids = ! empty( $forum_ids )
+        ? wp_parse_id_list( $forum_ids )
+        : array();
 
     return apply_filters( 'bbp_get_hidden_forum_ids', (array) $forum_ids );
@@ -2064 +2068 @@
  *
  * @uses get_option() Returns the unserialized array of private forum ids
+ * @uses wp_parse_id_list() Make sure array items are ints
  * @uses apply_filters() Calls 'bbp_forum_query_topic_ids' with the topic ids
  *                        and forum id
@@ -2069 +2074 @@
 function bbp_get_private_forum_ids() {
     $forum_ids = get_option( '_bbp_private_forums', array() );
+    $forum_ids = ! empty( $forum_ids )
+        ? wp_parse_id_list( $forum_ids )
+        : array();
 
     return apply_filters( 'bbp_get_private_forum_ids', (array) $forum_ids );