Editors on CiviCRM administrator screen do not have wp-admin

It looks like some of the fixes for fixing external links have caused CiviCRM to view Editors as non-administrators, and therefore doesn't give them wp-admin in their menu links.

Steps to reproduce:

Set up an editor account and give it access to CiviCRM.
Click on the CiviCRM link from wp-admin on a site
View the links from the drop-down menus.

On our site, clicking Contact > New Individual links the following as an editor:

http://www.mug.org/?page=CiviCRM&q=civicrm/contact/add&reset=1&ct=Individual

As administrator:

http://www.mug.org/wp-admin/admin.php?page=CiviCRM&q=civicrm/contact/add&reset=1&ct=Individual