Changeset 12281 for trunk/src/bp-core/bp-core-template.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-core/bp-core-template.php (modified) (3 diffs)

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