Skip to:
Content

BuddyPress.org

Changeset 1289


Ignore:
Timestamp:
03/31/2009 01:38:31 PM (15 years ago)
Author:
apeatling
Message:

Fixes #639

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core.php

    r1284 r1289  
    11861186    }
    11871187   
    1188     /* Sort the navigation array by key */
    1189     ksort($new_nav);
    1190    
    1191     /* Merge the remaining nav items, so they can be appended on the end */
    1192     $new_nav = array_merge( $new_nav, $nav_array );
     1188    if ( is_array( $new_nav ) ) {
     1189        /* Sort the navigation array by key */
     1190        ksort($new_nav);
     1191   
     1192        /* Merge the remaining nav items, so they can be appended on the end */
     1193        $new_nav = array_merge( $new_nav, $nav_array );
     1194    }
    11931195   
    11941196    return $new_nav;
Note: See TracChangeset for help on using the changeset viewer.