From d5b5f40afb1d0b6419a8d6a4bbbda90d08dab9de Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 20 Mar 2013 05:46:39 +0000 Subject: [PATCH] Fix object name. props GaryJ. see #14045. git-svn-id: https://develop.svn.wordpress.org/trunk@23760 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/js/nav-menu.js | 6 +++--- wp-admin/nav-menus.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/js/nav-menu.js b/wp-admin/js/nav-menu.js index f8501545a3..44a8886031 100644 --- a/wp-admin/js/nav-menu.js +++ b/wp-admin/js/nav-menu.js @@ -42,10 +42,10 @@ var wpNavMenu; this.attachUnsavedChangesListener(); - if( api.menuList.length ) + if ( api.menuList.length ) this.initSortables(); - if( menu.oneThemeLocationNoMenus ) + if ( menus.oneThemeLocationNoMenus ) $( '#posttype-page' ).addSelectedToMenu( api.addMenuItemToBottom ); this.initAccessibility(); @@ -162,7 +162,7 @@ var wpNavMenu; return this.each(function() { var t = $(this), menuItems = {}, - checkboxes = ( menu.oneThemeLocationNoMenus && 0 == t.find('.tabs-panel-active .categorychecklist li input:checked').length ) ? t.find('#page-all li input[type="checkbox"]') : t.find('.tabs-panel-active .categorychecklist li input:checked'), + checkboxes = ( menus.oneThemeLocationNoMenus && 0 == t.find('.tabs-panel-active .categorychecklist li input:checked').length ) ? t.find('#page-all li input[type="checkbox"]') : t.find('.tabs-panel-active .categorychecklist li input:checked'), re = new RegExp('menu-item\\[(\[^\\]\]*)'); processMethod = processMethod || api.addMenuItemToBottom; diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 334c93635b..08254e9033 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -355,7 +355,7 @@ $page_count = wp_count_posts( 'page' ); $one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false; $l10n = array( - "oneThemeLocationNoMenus" => ( $one_theme_location_no_menus ) ? 'true' : 'false', + "oneThemeLocationNoMenus" => $one_theme_location_no_menus, "move" => __( 'Move' ), "menuFocus" => __( 'Menu item %d of %d' ), "subMenuFocus" => __( 'Sub item number %d under' ),