Changeset 1289

Timestamp:

03/31/2009 01:38:31 PM (16 years ago)

Author:

apeatling

Message:

Fixes #639

File:

• trunk/bp-core.php (modified) (1 diff)

trunk/bp-core.php

@@ -1186 +1186 @@
     }
     
-    /* Sort the navigation array by key */
-    ksort($new_nav);
-    
-    /* Merge the remaining nav items, so they can be appended on the end */
-    $new_nav = array_merge( $new_nav, $nav_array );
+    if ( is_array( $new_nav ) ) {
+        /* Sort the navigation array by key */
+        ksort($new_nav);
+    
+        /* Merge the remaining nav items, so they can be appended on the end */
+        $new_nav = array_merge( $new_nav, $nav_array );
+    }
     
     return $new_nav;