Changeset 12281 for trunk/src/bp-blogs/bp-blogs-activity.php

Timestamp:

11/07/2018 04:09:00 PM (7 years ago)

Author:

boonebgorges

Message:

Avoid passing non-variables to empty() throughout codebase.

This ensures full compatibility with versions of PHP earlier than 5.5.

In some cases, we avoid the use of empty() by moving to its equivalent,
! isset( $foo ) || ! $foo. In some cases, we convert the tested value
to a variable before passing to empty().

See #7998.

File:

• trunk/src/bp-blogs/bp-blogs-activity.php (modified) (4 diffs)

trunk/src/bp-blogs/bp-blogs-activity.php

@@ -1159 +1159 @@
     // Initialize a local object so we won't have to query this again in the
     // comment loop.
-    if ( empty( buddypress()->blogs->allow_comments ) ) {
+    if ( ! isset( buddypress()->blogs->allow_comments ) ) {
         buddypress()->blogs->allow_comments = array();
     }
-    if ( empty( buddypress()->blogs->thread_depth ) ) {
+    if ( ! isset( buddypress()->blogs->thread_depth ) ) {
         buddypress()->blogs->thread_depth   = array();
     }
-    if ( empty( buddypress()->blogs->comment_moderation ) ) {
+    if ( ! isset( buddypress()->blogs->comment_moderation ) ) {
         buddypress()->blogs->comment_moderation = array();
     }
@@ -1243 +1243 @@
             // If comments are closed for the WP blog post, we should disable
             // activity comments for this activity entry.
-            if ( empty( buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) ) {
+            if ( ! isset( buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) || ! buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) {
                 $retval = false;
             }
 
             // If comments need moderation, disable activity commenting.
-            if ( ! empty( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) ) {
+            if ( isset( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) && buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) {
                 $retval = false;
             }
@@ -1329 +1329 @@
         // The blog post has closed off commenting, so we should disable all activity
         // comments under the parent 'new_blog_post' activity entry.
-        if ( empty( buddypress()->blogs->allow_comments[$comment->item_id] ) ) {
+        if ( ! buddypress()->blogs->allow_comments[ $comment->item_id ] ) {
             $retval = false;
         }
@@ -1335 +1335 @@
 
     // If comments need moderation, disable activity commenting.
-    if ( ! empty( buddypress()->blogs->comment_moderation[$comment->item_id] ) ) {
+    if ( isset( buddypress()->blogs->comment_moderation[ $comment->item_id ] ) && buddypress()->blogs->comment_moderation[ $comment->item_id ] ) {
         $retval = false;
     }