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

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;