Changeset 6135

Timestamp:

12/08/2016 02:43:27 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Tools: Fix undeclared variables and incorrect variable types, for improved PHP 7.1 compatibility.

This will quiet down most of our continuous integration noise.

Props hellofromTonya. Fixes #3031.

Location:

trunk/src/includes

Files:

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

trunk/src/includes/common/functions.php

@@ -513 +513 @@
         if ( current_user_can( 'read_private_topics' ) || current_user_can( 'edit_others_topics' ) || current_user_can( 'view_trash' ) ) {
 
+            // Declare empty arrays
+            $topics = $topic_titles = array();
+
             // Pending
             $topics['pending'] = ( ! empty( $r['count_pending_topics'] ) && current_user_can( 'edit_others_topics' ) ) ? (int) $all_topics->{$pending} : 0;
@@ -549 +552 @@
         if ( current_user_can( 'read_private_replies' ) || current_user_can( 'edit_others_replies' ) || current_user_can( 'view_trash' ) ) {
 
+            // Declare empty arrays
+            $replies = $reply_titles = array();
+
             // Pending
             $replies['pending'] = ( ! empty( $r['count_pending_replies'] ) && current_user_can( 'edit_others_replies' ) ) ? (int) $all_replies->{$pending} : 0;
@@ -572 +578 @@
             // Compile the hidden replies title
             $hidden_reply_title = implode( ' | ', array_filter( $reply_titles ) );
-
         }
     }

trunk/src/includes/forums/functions.php

@@ -2195 +2195 @@
         // Default to public status
         if ( empty( $post_stati ) ) {
-            $post_stati[] = bbp_get_public_status_id();
+            $post_stati = array( bbp_get_public_status_id() );
 
         // Split the status string

trunk/src/includes/forums/template.php

@@ -694 +694 @@
 
     // Setup post status array
-    $post_stati[] = bbp_get_public_status_id();
+    $post_stati = array( bbp_get_public_status_id() );
 
     // Super admin get whitelisted post statuses

trunk/src/includes/users/template.php

@@ -1722 +1722 @@
             $anonymous = bbp_is_reply_anonymous( $r['post_id'] );
 
+            // Declare empty array
+            $author_links = array();
+
             // Get avatar
             if ( 'avatar' === $r['type'] || 'both' === $r['type'] ) {