Changeset 11797

Timestamp:

01/05/2018 01:38:15 PM (7 years ago)

Author:

djpaul

Message:

Templates, Nouveau: fix PHP Notice when secondary navigation is not set.

For example, as a anonymous users with the third-party plugin, "Social Articles".

Fixes #7629

Props hnla

Location:

trunk/src

Files:

• bp-core/classes/class-bp-core-nav.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/template-tags.php (modified) (1 diff)

trunk/src/bp-core/classes/class-bp-core-nav.php

@@ -353 +353 @@
      * @param array $args Filters to select the specific secondary items. See wp_list_filter().
      * @param bool  $sort True to sort the nav items. False otherwise.
-     * @return array The list of secondary objects nav
+     * @return bool|array The list of secondary objects nav, or false if none set.
      */
     public function get_secondary( $args = array(), $sort = true ) {

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -756 +756 @@
     }
 
+    // The navigation can be empty.
+    if ( $nav === false ) {
+        $nav = array();
+    }
+
     $bp_nouveau->sorted_nav = array_values( $nav );