Changeset 6684

Timestamp:

09/09/2017 02:43:03 PM (6 years ago)

Author:

johnjamesjacoby

Message:

General: more PHP7.1 array fixes.

See #3031. 2.5 branch, for 2.5.14.

Location:

branches/2.5/includes

Files:

• common/template.php (modified) (1 diff)
• forums/functions.php (modified) (1 diff)
• replies/template.php (modified) (1 diff)
• topics/template.php (modified) (3 diffs)
• users/template.php (modified) (1 diff)

branches/2.5/includes/common/template.php

@@ -1820 +1820 @@
 function bbp_get_tiny_mce_plugins( $plugins = array() ) {
 
+    $plugins = (array) $plugins;
+
     // Unset fullscreen
     foreach ( $plugins as $key => $value ) {

branches/2.5/includes/forums/functions.php

@@ -1849 +1849 @@
 
         // Get any existing meta queries
-        $meta_query   = $posts_query->get( 'meta_query', array() );
+        $meta_query   = (array) $posts_query->get( 'meta_query', array() );
 
         // Add our meta query to existing

branches/2.5/includes/replies/template.php

@@ -1235 +1235 @@
             if ( empty( $anonymous ) && bbp_user_has_profile( bbp_get_reply_author_id( $reply_id ) ) ) {
 
+                $author_link = array();
+
                 // Assemble the links
                 foreach ( $author_links as $link => $link_text ) {

branches/2.5/includes/topics/template.php

@@ -1506 +1506 @@
             if ( empty( $anonymous ) && bbp_user_has_profile( bbp_get_topic_author_id( $topic_id ) ) ) {
 
+                $author_link = array();
+
                 // Assemble the links
                 foreach ( $author_links as $link => $link_text ) {
@@ -3803 +3805 @@
             }
 
+            $new_terms = array();
+
             // Topic exists
             if ( !empty( $topic_id ) ) {
@@ -3808 +3812 @@
                 // Topic is spammed so display pre-spam terms
                 if ( bbp_is_topic_spam( $topic_id ) ) {
-
-                    // Get pre-spam terms
                     $new_terms = get_post_meta( $topic_id, '_bbp_spam_topic_tags', true );
-
-                    // If terms exist, explode them and compile the return value
-                    if ( empty( $new_terms ) ) {
-                        $new_terms = '';
-                    }
 
                 // Topic is not spam so get real terms
                 } else {
-                    $terms = array_filter( (array) get_the_terms( $topic_id, bbp_get_topic_tag_tax_id() ) );
-
-                    // Loop through them
-                    foreach ( $terms as $term ) {
-                        $new_terms[] = $term->name;
-                    }
+                    $terms     = array_filter( (array) get_the_terms( $topic_id, bbp_get_topic_tag_tax_id() ) );
+                    $new_terms = wp_list_pluck( $terms, 'name' );
                 }
-
-            // Define local variable(s)
-            } else {
-                $new_terms = '';
             }
 

branches/2.5/includes/users/template.php

@@ -1675 +1675 @@
             if ( empty( $anonymous ) && bbp_user_has_profile( $user_id ) ) {
                 $author_url = bbp_get_user_profile_url( $user_id );
+                $author_link = array();
                 foreach ( $author_links as $link_text ) {
                     $author_link[] = sprintf( '<a href="%1$s"%2$s>%3$s</a>', esc_url( $author_url ), $link_title, $link_text );