Changeset 46642
- Timestamp:
- 11/03/2019 10:12:32 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/admin-bar.php
r46164 r46642 132 132 } 133 133 134 $wp_admin_bar->add_ menu( $wp_logo_menu_args );134 $wp_admin_bar->add_node( $wp_logo_menu_args ); 135 135 136 136 if ( $about_url ) { 137 137 // Add "About WordPress" link 138 $wp_admin_bar->add_ menu(138 $wp_admin_bar->add_node( 139 139 array( 140 140 'parent' => 'wp-logo', … … 147 147 148 148 // Add WordPress.org link 149 $wp_admin_bar->add_ menu(149 $wp_admin_bar->add_node( 150 150 array( 151 151 'parent' => 'wp-logo-external', … … 157 157 158 158 // Add codex link 159 $wp_admin_bar->add_ menu(159 $wp_admin_bar->add_node( 160 160 array( 161 161 'parent' => 'wp-logo-external', … … 167 167 168 168 // Add forums link 169 $wp_admin_bar->add_ menu(169 $wp_admin_bar->add_node( 170 170 array( 171 171 'parent' => 'wp-logo-external', … … 177 177 178 178 // Add feedback link 179 $wp_admin_bar->add_ menu(179 $wp_admin_bar->add_node( 180 180 array( 181 181 'parent' => 'wp-logo-external', … … 196 196 function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) { 197 197 if ( is_admin() ) { 198 $wp_admin_bar->add_ menu(198 $wp_admin_bar->add_node( 199 199 array( 200 200 'id' => 'menu-toggle', … … 234 234 $class = empty( $avatar ) ? '' : 'with-avatar'; 235 235 236 $wp_admin_bar->add_ menu(236 $wp_admin_bar->add_node( 237 237 array( 238 238 'id' => 'my-account', … … 284 284 } 285 285 286 $wp_admin_bar->add_ menu(286 $wp_admin_bar->add_node( 287 287 array( 288 288 'parent' => 'user-actions', … … 297 297 298 298 if ( false !== $profile_url ) { 299 $wp_admin_bar->add_ menu(299 $wp_admin_bar->add_node( 300 300 array( 301 301 'parent' => 'user-actions', … … 307 307 } 308 308 309 $wp_admin_bar->add_ menu(309 $wp_admin_bar->add_node( 310 310 array( 311 311 'parent' => 'user-actions', … … 351 351 $title = wp_html_excerpt( $blogname, 40, '…' ); 352 352 353 $wp_admin_bar->add_ menu(353 $wp_admin_bar->add_node( 354 354 array( 355 355 'id' => 'site-name', … … 363 363 if ( is_admin() ) { 364 364 // Add an option to visit the site. 365 $wp_admin_bar->add_ menu(365 $wp_admin_bar->add_node( 366 366 array( 367 367 'parent' => 'site-name', … … 373 373 374 374 if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) { 375 $wp_admin_bar->add_ menu(375 $wp_admin_bar->add_node( 376 376 array( 377 377 'parent' => 'site-name', … … 384 384 } elseif ( current_user_can( 'read' ) ) { 385 385 // We're on the front end, link to the Dashboard. 386 $wp_admin_bar->add_ menu(386 $wp_admin_bar->add_node( 387 387 array( 388 388 'parent' => 'site-name', … … 429 429 } 430 430 431 $wp_admin_bar->add_ menu(431 $wp_admin_bar->add_node( 432 432 array( 433 433 'id' => 'customize', … … 466 466 } 467 467 468 $wp_admin_bar->add_ menu(468 $wp_admin_bar->add_node( 469 469 array( 470 470 'id' => 'my-sites', … … 482 482 ); 483 483 484 $wp_admin_bar->add_ menu(484 $wp_admin_bar->add_node( 485 485 array( 486 486 'parent' => 'my-sites-super-admin', … … 491 491 ); 492 492 493 $wp_admin_bar->add_ menu(493 $wp_admin_bar->add_node( 494 494 array( 495 495 'parent' => 'network-admin', … … 501 501 502 502 if ( current_user_can( 'manage_sites' ) ) { 503 $wp_admin_bar->add_ menu(503 $wp_admin_bar->add_node( 504 504 array( 505 505 'parent' => 'network-admin', … … 512 512 513 513 if ( current_user_can( 'manage_network_users' ) ) { 514 $wp_admin_bar->add_ menu(514 $wp_admin_bar->add_node( 515 515 array( 516 516 'parent' => 'network-admin', … … 523 523 524 524 if ( current_user_can( 'manage_network_themes' ) ) { 525 $wp_admin_bar->add_ menu(525 $wp_admin_bar->add_node( 526 526 array( 527 527 'parent' => 'network-admin', … … 534 534 535 535 if ( current_user_can( 'manage_network_plugins' ) ) { 536 $wp_admin_bar->add_ menu(536 $wp_admin_bar->add_node( 537 537 array( 538 538 'parent' => 'network-admin', … … 545 545 546 546 if ( current_user_can( 'manage_network_options' ) ) { 547 $wp_admin_bar->add_ menu(547 $wp_admin_bar->add_node( 548 548 array( 549 549 'parent' => 'network-admin', … … 581 581 582 582 if ( current_user_can( 'read' ) ) { 583 $wp_admin_bar->add_ menu(583 $wp_admin_bar->add_node( 584 584 array( 585 585 'parent' => 'my-sites-list', … … 590 590 ); 591 591 592 $wp_admin_bar->add_ menu(592 $wp_admin_bar->add_node( 593 593 array( 594 594 'parent' => $menu_id, … … 599 599 ); 600 600 } else { 601 $wp_admin_bar->add_ menu(601 $wp_admin_bar->add_node( 602 602 array( 603 603 'parent' => 'my-sites-list', … … 610 610 611 611 if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) { 612 $wp_admin_bar->add_ menu(612 $wp_admin_bar->add_node( 613 613 array( 614 614 'parent' => $menu_id, … … 621 621 622 622 if ( current_user_can( 'edit_posts' ) ) { 623 $wp_admin_bar->add_ menu(623 $wp_admin_bar->add_node( 624 624 array( 625 625 'parent' => $menu_id, … … 631 631 } 632 632 633 $wp_admin_bar->add_ menu(633 $wp_admin_bar->add_node( 634 634 array( 635 635 'parent' => $menu_id, … … 661 661 $html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />'; 662 662 663 $wp_admin_bar->add_ menu(663 $wp_admin_bar->add_node( 664 664 array( 665 665 'id' => $id, … … 703 703 if ( 'draft' == $post->post_status ) { 704 704 $preview_link = get_preview_post_link( $post ); 705 $wp_admin_bar->add_ menu(705 $wp_admin_bar->add_node( 706 706 array( 707 707 'id' => 'preview', … … 712 712 ); 713 713 } else { 714 $wp_admin_bar->add_ menu(714 $wp_admin_bar->add_node( 715 715 array( 716 716 'id' => 'view', … … 736 736 $tax = get_taxonomy( $tag->taxonomy ); 737 737 if ( is_taxonomy_viewable( $tax ) ) { 738 $wp_admin_bar->add_ menu(738 $wp_admin_bar->add_node( 739 739 array( 740 740 'id' => 'view', … … 748 748 $view_link = get_author_posts_url( $user_object->ID ); 749 749 if ( $user_object->exists() && $view_link ) { 750 $wp_admin_bar->add_ menu(750 $wp_admin_bar->add_node( 751 751 array( 752 752 'id' => 'view', … … 771 771 && current_user_can( 'edit_post', $current_object->ID ) 772 772 && $post_type_object->show_in_admin_bar ) { 773 $wp_admin_bar->add_ menu(773 $wp_admin_bar->add_node( 774 774 array( 775 775 'id' => 'edit', … … 783 783 $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ); 784 784 if ( $tax && $edit_term_link && current_user_can( 'edit_term', $current_object->term_id ) ) { 785 $wp_admin_bar->add_ menu(785 $wp_admin_bar->add_node( 786 786 array( 787 787 'id' => 'edit', … … 794 794 $edit_user_link = get_edit_user_link( $current_object->ID ); 795 795 if ( $edit_user_link ) { 796 $wp_admin_bar->add_ menu(796 $wp_admin_bar->add_node( 797 797 array( 798 798 'id' => 'edit', … … 860 860 $title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>'; 861 861 862 $wp_admin_bar->add_ menu(862 $wp_admin_bar->add_node( 863 863 array( 864 864 'id' => 'new-content', … … 871 871 list( $title, $id ) = $action; 872 872 873 $wp_admin_bar->add_ menu(873 $wp_admin_bar->add_node( 874 874 array( 875 875 'parent' => 'new-content', … … 906 906 $title .= '<span class="screen-reader-text comments-in-moderation-text">' . $awaiting_text . '</span>'; 907 907 908 $wp_admin_bar->add_ menu(908 $wp_admin_bar->add_node( 909 909 array( 910 910 'id' => 'comments', … … 931 931 932 932 if ( current_user_can( 'switch_themes' ) ) { 933 $wp_admin_bar->add_ menu(933 $wp_admin_bar->add_node( 934 934 array( 935 935 'parent' => 'appearance', … … 946 946 947 947 if ( current_theme_supports( 'widgets' ) ) { 948 $wp_admin_bar->add_ menu(948 $wp_admin_bar->add_node( 949 949 array( 950 950 'parent' => 'appearance', … … 957 957 958 958 if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) { 959 $wp_admin_bar->add_ menu(959 $wp_admin_bar->add_node( 960 960 array( 961 961 'parent' => 'appearance', … … 968 968 969 969 if ( current_theme_supports( 'custom-background' ) ) { 970 $wp_admin_bar->add_ menu(970 $wp_admin_bar->add_node( 971 971 array( 972 972 'parent' => 'appearance', … … 982 982 983 983 if ( current_theme_supports( 'custom-header' ) ) { 984 $wp_admin_bar->add_ menu(984 $wp_admin_bar->add_node( 985 985 array( 986 986 'parent' => 'appearance', … … 1015 1015 $title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>'; 1016 1016 1017 $wp_admin_bar->add_ menu(1017 $wp_admin_bar->add_node( 1018 1018 array( 1019 1019 'id' => 'updates', … … 1045 1045 $form .= '</form>'; 1046 1046 1047 $wp_admin_bar->add_ menu(1047 $wp_admin_bar->add_node( 1048 1048 array( 1049 1049 'parent' => 'top-secondary', … … 1074 1074 $url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION ); 1075 1075 1076 $wp_admin_bar->add_ menu(1076 $wp_admin_bar->add_node( 1077 1077 array( 1078 1078 'parent' => 'top-secondary', -
trunk/src/wp-includes/blocks/latest-comments.php
r46607 r46642 42 42 */ 43 43 function render_block_core_latest_comments( $attributes = array() ) { 44 // This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php. 44 45 $comments = get_comments( 45 /** This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php */46 46 apply_filters( 47 47 'widget_comments_args', -
trunk/src/wp-includes/class-wp-admin-bar.php
r46140 r46642 83 83 84 84 /** 85 * @param array $node 85 * Add a node (menu item) to the Admin Bar menu. 86 * 87 * @since 3.3.0 88 * @since 5.4.0 Deprecated in favor of {@see WP_Admin_Bar::add_node()}. 89 * 90 * @param array $node The attributes that define the node. 86 91 */ 87 92 public function add_menu( $node ) { 93 _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::add_node()' ); 88 94 $this->add_node( $node ); 89 95 } 90 96 91 97 /** 92 * @param string $id 98 * Remove a node from the admin bar. 99 * 100 * @since 3.1.0 101 * @since 5.4.0 Deprecated in favor of {@see WP_Admin_Bar::remove_node()}. 102 * 103 * @param string $id The menu slug to remove. 93 104 */ 94 105 public function remove_menu( $id ) { 106 _deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::remove_node()' ); 95 107 $this->remove_node( $id ); 96 108 } -
trunk/tests/phpunit/tests/adminbar.php
r46586 r46642 347 347 348 348 /** 349 * @ticket 19647 350 */ 351 public function test_deprecated_menu_methods() { 352 $admin_bar = new WP_Admin_Bar(); 353 $node_data = array( 'id' => 'test-node-19647' ); 354 355 // Test add_menu() deprecation. 356 $this->setExpectedDeprecated( 'WP_Admin_Bar::add_menu' ); 357 $admin_bar->add_menu( $node_data ); 358 $node_test = $admin_bar->get_node( 'test-node-19647' ); 359 $this->assertNotNull( $node_test ); 360 361 // Test remove_menu() deprecation. 362 $this->setExpectedDeprecated( 'WP_Admin_Bar::remove_menu' ); 363 $admin_bar->remove_menu( 'test-node-19647' ); 364 $node_test = $admin_bar->get_node( 'test-node-19647' ); 365 $this->assertNull( $node_test ); 366 } 367 368 /** 349 369 * @ticket 22247 350 370 */
Note: See TracChangeset
for help on using the changeset viewer.