My Sites menu has invalid markup

[wpmuguru]

The My Sites menu currently has a <ul> within a <ul> and no intervening <li> when the user is a super admin.

[wpmuguru]

ignore 19221.diff

[wpmuguru]

The first patch fixed the issue for super admins but created an issue with non-super admins.

[nacin]

Looks like 19221.2.diff​ has a logic inversion — we want sites to be secondary if there is a "Network Admin" menu, so secondary => true should be for super admins.

That said, [19230] forgot to force secondary items to primary items when there are no primary items. I'm going to commit a change for that as well.

[nacin]

In [19235]:

Show sites in the 'My Sites' menu as secondary items only when the user is a super admin and therefore has a primary menu item (Network Admin). props wpmuguru, fixes #19221.

[nacin]

In [19236]:

Promote secondary admin bar items to primary if there are no primary items at time of render. see #19136, #19221.