Changeset 42217 for trunk/src/wp-admin/includes/nav-menu.php

Timestamp:

11/23/2017 04:08:42 AM (7 years ago)

Author:

pento

Message:

General: Reformat inline if () statements inside HTML tags.

This pattern occurs a handful of times across the codebase:

<div class="foo<?php if ( $bar ) { echo ' baz'; } ?>">

Unfortunately, it doesn't really play nicely with phpcbf, so all instances need to be removed in preperation for auto code formatting.

See #41057.

File:

• trunk/src/wp-admin/includes/nav-menu.php (modified) (2 diffs)

trunk/src/wp-admin/includes/nav-menu.php

@@ -391 +391 @@
     );
 
+    $most_recent_url = $view_all_url = $search_url = '';
+    if ( $nav_menu_selected_id ) {
+        $most_recent_url = esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+        $view_all_url    = esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+        $search_url      = esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+    }
     ?>
     <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
         <ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
             <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+                <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
                     <?php _e( 'Most Recent' ); ?>
                 </a>
             </li>
             <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+                <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
                     <?php _e( 'View All' ); ?>
                 </a>
             </li>
             <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+                <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
                     <?php _e( 'Search'); ?>
                 </a>
@@ -679 +685 @@
     );
 
+    $most_used_url = $view_all_url = $search_url = '';
+    if ( $nav_menu_selected_id ) {
+        $most_used_url = esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+        $view_all_url  = esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+        $search_url    = esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+    }
     ?>
     <div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
         <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
             <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+                <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
                     <?php echo esc_html( $taxonomy->labels->most_used ); ?>
                 </a>
             </li>
             <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+                <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
                     <?php _e( 'View All' ); ?>
                 </a>
             </li>
             <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-                <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+                <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
                     <?php _e( 'Search' ); ?>
                 </a>