Changeset 49975

Timestamp:

01/18/2021 09:48:23 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Improve code layout in wp-admin/includes/class-wp-media-list-table.php.

This allows for better readability and easier understanding of where each section opens and closes.

Props laxman-prajapati, hansjovisyoast, audrasjb.
Fixes #51014.

File:

• trunk/src/wp-admin/includes/class-wp-media-list-table.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -197 +197 @@
                 ?>
                 <div class="actions">
-                <?php
-                if ( ! $this->is_trash ) {
-                        $this->months_dropdown( 'attachment' );
-                }
-
-                /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-                do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
-
-                submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-
-                if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
-                        submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
-                }
-                ?>
+                        <?php
+                        if ( ! $this->is_trash ) {
+                                $this->months_dropdown( 'attachment' );
+                        }
+
+                        /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+                        do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+
+                        submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+
+                        if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
+                                submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+                        }
+                        ?>
                 </div>
                 <?php
@@ -263 +263 @@
                 $this->screen->render_screen_reader_content( 'heading_views' );
                 ?>
-<div class="wp-filter">
-        <div class="filter-items">
-                <?php $this->view_switcher( $mode ); ?>
-
-                <label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
-                <select class="attachment-filters" name="attachment-filter" id="attachment-filter">
-                        <?php
-                        if ( ! empty( $views ) ) {
-                                foreach ( $views as $class => $view ) {
-                                        echo "\t$view\n";
+                <div class="wp-filter">
+                        <div class="filter-items">
+                                <?php $this->view_switcher( $mode ); ?>
+
+                                <label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+                                <select class="attachment-filters" name="attachment-filter" id="attachment-filter">
+                                        <?php
+                                        if ( ! empty( $views ) ) {
+                                                foreach ( $views as $class => $view ) {
+                                                        echo "\t$view\n";
+                                                }
+                                        }
+                                        ?>
+                                </select>
+
+                                <?php
+                                $this->extra_tablenav( 'bar' );
+
+                                /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+                                $views = apply_filters( "views_{$this->screen->id}", array() );
+
+                                // Back compat for pre-4.0 view links.
+                                if ( ! empty( $views ) ) {
+                                        echo '<ul class="filter-links">';
+                                        foreach ( $views as $class => $view ) {
+                                                echo "<li class='$class'>$view</li>";
+                                        }
+                                        echo '</ul>';
                                 }
-                        }
-                        ?>
-                </select>
-
-                <?php
-                $this->extra_tablenav( 'bar' );
-
-                /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-                $views = apply_filters( "views_{$this->screen->id}", array() );
-
-                // Back compat for pre-4.0 view links.
-                if ( ! empty( $views ) ) {
-                        echo '<ul class="filter-links">';
-                        foreach ( $views as $class => $view ) {
-                                echo "<li class='$class'>$view</li>";
-                        }
-                        echo '</ul>';
-                }
-                ?>
-        </div>
-
-        <div class="search-form">
-                <label for="media-search-input" class="media-search-input-label"><?php esc_html_e( 'Search' ); ?></label>
-                <input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
-        </div>
+                                ?>
+                        </div>
+
+                        <div class="search-form">
+                                <label for="media-search-input" class="media-search-input-label"><?php esc_html_e( 'Search' ); ?></label>
+                                <input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
+                        </div>
+                </div>
                 <?php
         }
@@ -513 +514 @@
 
                         if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
-                                ?>
-                                <strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
-                                        <?php echo $title; ?></a></strong>
-                                                                <?php
+                                printf( '<strong><a href="%s">%s</a></strong>', get_edit_post_link( $post->post_parent ), $title );
                         } elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
-                                ?>
-                                <strong><?php echo $title; ?></strong>
-                                                                        <?php
+                                printf( '<strong>%s</strong>', $title );
                         } else {
                                 _e( '(Private post)' );
@@ -651 +647 @@
                 while ( have_posts() ) :
                         the_post();
-                        if (
-                                ( $this->is_trash && 'trash' !== $post->post_status )
-                                || ( ! $this->is_trash && 'trash' === $post->post_status )
+                        if ( $this->is_trash && 'trash' !== $post->post_status
+                                || ! $this->is_trash && 'trash' === $post->post_status
                         ) {
                                 continue;