Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use get_registered_nav_menus() in has_nav_menu(). 

props voldemortensen.
fixes #29461.
Built from https://develop.svn.wordpress.org/trunk@29717


git-svn-id: http://core.svn.wordpress.org/trunk@29491 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-09-07 10:04:16 +00:00
parent 62d51238ee
commit f84cbb4ba8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/nav-menu.php
View File

@ -142,9 +142,8 @@ function get_nav_menu_locations() {
* @return bool Whether location has a menu.
*/
function has_nav_menu( $location ) {
global $_wp_registered_nav_menus;
if ( ! isset( $_wp_registered_nav_menus[ $location ] ) ) {
$registered_nav_menus = get_registered_nav_menus();
if ( ! isset( $registered_nav_menus[ $location ] ) ) {
return false;
}