Changeset 12281

Timestamp:

11/07/2018 04:09:00 PM (6 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.

Location:

trunk/src

Files:

• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-blogs/bp-blogs-activity.php (modified) (4 diffs)
• bp-core/bp-core-functions.php (modified) (4 diffs)
• bp-core/bp-core-template-loader.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (3 diffs)
• bp-core/bp-core-theme-compatibility.php (modified) (1 diff)
• bp-core/classes/class-bp-core-oembed-extension.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (1 diff)

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

@@ -323 +323 @@
     }
 
+    $bp = buddypress();
+
     // If our temporary variable doesn't exist, stop now.
-    if ( empty( buddypress()->activity->mentioned_users ) )
+    if ( empty( $bp->activity->mentioned_users ) )
         return;
 
     // Grab our temporary variable from bp_activity_at_name_filter_updates().
-    $usernames = buddypress()->activity->mentioned_users;
+    $usernames = $bp->activity->mentioned_users;
 
     // Get rid of temporary variable.
-    unset( buddypress()->activity->mentioned_users );
+    unset( $bp->activity->mentioned_users );
 
     // Send @mentions and setup BP notifications.

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

@@ -21 +21 @@
  */
 function bp_activity_has_directory() {
-    return (bool) !empty( buddypress()->pages->activity->id );
+    return isset( buddypress()->pages->activity->id ) && buddypress()->pages->activity->id;
 }
 

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;
     }

trunk/src/bp-core/bp-core-functions.php

@@ -2549 +2549 @@
  */
 function bp_nav_menu_get_loggedin_pages() {
+    $bp = buddypress();
 
     // Try to catch the cached version first.
-    if ( ! empty( buddypress()->wp_nav_menu_items->loggedin ) ) {
-        return buddypress()->wp_nav_menu_items->loggedin;
+    if ( ! empty( $bp->wp_nav_menu_items->loggedin ) ) {
+        return $bp->wp_nav_menu_items->loggedin;
     }
 
     // Pull up a list of items registered in BP's primary nav for the member.
-    $bp_menu_items = buddypress()->members->nav->get_primary();
+    $bp_menu_items = $bp->members->nav->get_primary();
 
     // Some BP nav menu items will not be represented in bp_nav, because
@@ -2591 +2592 @@
     }
 
-    if ( empty( buddypress()->wp_nav_menu_items ) ) {
+    if ( empty( $bp->wp_nav_menu_items ) ) {
         buddypress()->wp_nav_menu_items = new stdClass;
     }
 
-    buddypress()->wp_nav_menu_items->loggedin = $page_args;
+    $bp->wp_nav_menu_items->loggedin = $page_args;
 
     return $page_args;
@@ -2615 +2616 @@
  */
 function bp_nav_menu_get_loggedout_pages() {
+    $bp = buddypress();
 
     // Try to catch the cached version first.
-    if ( ! empty( buddypress()->wp_nav_menu_items->loggedout ) ) {
-        return buddypress()->wp_nav_menu_items->loggedout;
+    if ( ! empty( $bp->wp_nav_menu_items->loggedout ) ) {
+        return $bp->wp_nav_menu_items->loggedout;
     }
 
@@ -2665 +2667 @@
     }
 
-    if ( empty( buddypress()->wp_nav_menu_items ) ) {
-        buddypress()->wp_nav_menu_items = new stdClass;
-    }
-
-    buddypress()->wp_nav_menu_items->loggedout = $page_args;
+    if ( empty( $bp->wp_nav_menu_items ) ) {
+        $bp->wp_nav_menu_items = new stdClass;
+    }
+
+    $bp->wp_nav_menu_items->loggedout = $page_args;
 
     return $page_args;

trunk/src/bp-core/bp-core-template-loader.php

@@ -563 +563 @@
  */
 function bp_is_template_included() {
-    return ! empty( buddypress()->theme_compat->found_template );
+    return isset( buddypress()->theme_compat->found_template ) && buddypress()->theme_compat->found_template;
 }
 

trunk/src/bp-core/bp-core-template.php

@@ -139 +139 @@
 
     // Use the string provided by the component.
-    if ( ! empty( buddypress()->{$component}->directory_title ) ) {
+    if ( isset( buddypress()->{$component}->directory_title ) && buddypress()->{$component}->directory_title ) {
         $title = buddypress()->{$component}->directory_title;
 
@@ -1150 +1150 @@
  */
 function bp_account_was_activated() {
-    $activation_complete = ! empty( buddypress()->activation_complete ) || ( bp_is_current_component( 'activate' ) && ! empty( $_GET['activated'] ) );
+    $bp = buddypress();
+
+    $activation_complete = ! empty( $bp->activation_complete ) || ( bp_is_current_component( 'activate' ) && ! empty( $_GET['activated'] ) );
 
     return $activation_complete;
@@ -2082 +2084 @@
             }
 
-            if ( empty( buddypress()->$component->features ) || false === in_array( $feature, buddypress()->$component->features, true ) ) {
+            $component_features = isset( buddypress()->{$component}->features ) ? buddypress()->{$component}->features : array();
+
+            if ( empty( $component_features ) || false === in_array( $feature, $component_features, true ) ) {
                 $retval = false;
             }

trunk/src/bp-core/bp-core-theme-compatibility.php

@@ -687 +687 @@
 
     // Bail if the template already matches a BuddyPress template.
-    if ( ! empty( buddypress()->theme_compat->found_template ) ) {
+    if ( isset( buddypress()->theme_compat->found_template ) && buddypress()->theme_compat->found_template ) {
         return $template;
     }

trunk/src/bp-core/classes/class-bp-core-oembed-extension.php

@@ -425 +425 @@
             // Add markers to tell that we're embedding a single activity.
             // This is needed for various oEmbed response data filtering.
-            if ( empty( buddypress()->{$this->slug_endpoint} ) ) {
+            if ( ! isset( buddypress()->{$this->slug_endpoint} ) || ! buddypress()->{$this->slug_endpoint} ) {
                 buddypress()->{$this->slug_endpoint} = new stdClass;
             }
@@ -534 +534 @@
 
             // Add custom route args to iframe.
-            if ( ! empty( buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) ) {
+            if ( isset( buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) && buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) {
                 foreach( buddypress()->{$this->slug_endpoint}->embedargs_in_progress as $key => $value ) {
                     $url = add_query_arg( $key, $value, $url );

trunk/src/bp-groups/bp-groups-template.php

@@ -5615 +5615 @@
         if ( groups_get_current_group() ) {
             $r['group_id'] = bp_get_current_group_id();
-        } elseif ( ! empty( buddypress()->groups->new_group_id ) ) {
+        } elseif ( isset( buddypress()->groups->new_group_id ) && buddypress()->groups->new_group_id ) {
             $r['group_id'] = buddypress()->groups->new_group_id;
         }