Changeset 45934 for trunk/src/wp-admin/includes/media.php

Timestamp:

09/04/2019 01:10:57 AM (6 years ago)

Author:

azaozz

Message:

Uploads: After an image is uploaded and PHP times out or runs out of memory during post-processing (the server response is HTTP 500 error), try to resize it three more times. Then, if all attempts fail, do a cleanup of any sub-sizes that may have been created and show an error message asking the user to scale the image and upload it again.

See #47872.

File:

• trunk/src/wp-admin/includes/media.php (modified) (114 diffs)

trunk/src/wp-admin/includes/media.php

@@ -81 +81 @@
     if ( ! empty( $tabs ) ) {
         echo "<ul id='sidemenu'>\n";
+
         if ( isset( $redir_tab ) && array_key_exists( $redir_tab, $tabs ) ) {
             $current = $redir_tab;
@@ -109 +110 @@
             echo "\t<li id='" . esc_attr( "tab-$callback" ) . "'>$link</li>\n";
         }
+
         echo "</ul>\n";
     }
@@ -266 +268 @@
 function media_send_to_editor( $html ) {
     ?>
-<script type="text/javascript">
-var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
-</script>
+    <script type="text/javascript">
+    var win = window.dialogArguments || opener || parent || top;
+    win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
+    </script>
     <?php
     exit;
@@ -287 +289 @@
  */
 function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
-
     $time = current_time( 'mysql' );
     $post = get_post( $post_id );
+
     if ( $post ) {
         // The post date doesn't usually matter for pages, so don't backdate this upload.
@@ -307 +309 @@
     $name = wp_basename( $name, ".$ext" );
 
-    $url     = $file['url'];
-    $type    = $file['type'];
-    $file    = $file['file'];
-    $title   = sanitize_text_field( $name );
-    $content = '';
-    $excerpt = '';
+    $url       = $file['url'];
+    $type      = $file['type'];
+    $file      = $file['file'];
+    $title     = sanitize_text_field( $name );
+    $content   = '';
+    $excerpt   = '';
+    $image_ref = false;
 
     if ( preg_match( '#^audio#', $type ) ) {
@@ -357 +360 @@
         if ( ! empty( $meta['track_number'] ) ) {
             $track_number = explode( '/', $meta['track_number'] );
+
             if ( isset( $track_number[1] ) ) {
                 /* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks. */
@@ -373 +377 @@
         // Use image exif/iptc data for title and caption defaults if possible.
     } elseif ( 0 === strpos( $type, 'image/' ) ) {
+        // Image file reference passed by the uploader.
+        if ( ! empty( $_POST['_wp_temp_image_ref'] ) ) {
+            $image_ref = preg_replace( '/[^a-zA-Z0-9_]/', '', $_POST['_wp_temp_image_ref'] );
+        }
+
         $image_meta = wp_read_image_metadata( $file );
+
         if ( $image_meta ) {
             if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
@@ -402 +412 @@
 
     // Save the data
-    $id = wp_insert_attachment( $attachment, $file, $post_id, true );
-    if ( ! is_wp_error( $id ) ) {
-        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-    }
-
-    return $id;
-
+    $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+    if ( ! is_wp_error( $attachment_id ) ) {
+        // If an image, keep the upload reference until all image sub-sizes are created.
+        if ( $image_ref ) {
+            set_transient( '_wp_temp_image_ref:' . $image_ref, $attachment_id, HOUR_IN_SECONDS );
+        }
+
+        // The image sub-sizes are created during wp_generate_attachment_metadata().
+        // This is generally slow and may cause timeouts or out of memory errors.
+        wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+
+        // At this point the image is uploaded successfully even if there were specific errors or some sub-sizes were not created.
+        // The transient is not needed any more.
+        if ( $image_ref ) {
+            delete_transient( '_wp_temp_image_ref:' . $image_ref );
+        }
+    }
+
+    return $attachment_id;
 }
 
@@ -427 +450 @@
     $time = current_time( 'mysql' );
     $post = get_post( $post_id );
+
     if ( $post ) {
         if ( substr( $post->post_date, 0, 4 ) > 0 ) {
@@ -434 +458 @@
 
     $file = wp_handle_sideload( $file_array, $overrides, $time );
+
     if ( isset( $file['error'] ) ) {
         return new WP_Error( 'upload_error', $file['error'] );
@@ -446 +471 @@
     // Use image exif/iptc data for title and caption defaults if possible.
     $image_meta = wp_read_image_metadata( $file );
+
     if ( $image_meta ) {
         if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
             $title = $image_meta['title'];
         }
+
         if ( trim( $image_meta['caption'] ) ) {
             $content = $image_meta['caption'];
@@ -475 +502 @@
 
     // Save the attachment metadata
-    $id = wp_insert_attachment( $attachment, $file, $post_id, true );
-    if ( ! is_wp_error( $id ) ) {
-        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-    }
-
-    return $id;
+    $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+    if ( ! is_wp_error( $attachment_id ) ) {
+        wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+    }
+
+    return $attachment_id;
 }
 
@@ -496 +524 @@
     _wp_admin_html_begin();
     ?>
-<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
+    <title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
     <?php
 
     wp_enqueue_style( 'colors' );
     // Check callback name for 'media'
-    if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
-    || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
+    if (
+        ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) ||
+        ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) )
+    ) {
         wp_enqueue_style( 'deprecated-media' );
     }
     wp_enqueue_style( 'ie' );
+
     ?>
-<script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
-isRtl = <?php echo (int) is_rtl(); ?>;
-</script>
+    <script type="text/javascript">
+    addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+    var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+    isRtl = <?php echo (int) is_rtl(); ?>;
+    </script>
     <?php
     /** This action is documented in wp-admin/admin-header.php */
@@ -563 +594 @@
 
     $body_id_attr = '';
+
     if ( isset( $GLOBALS['body_id'] ) ) {
         $body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
     }
+
     ?>
-</head>
-<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
-<script type="text/javascript">
-document.body.className = document.body.className.replace('no-js', 'js');
-</script>
+    </head>
+    <body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
+    <script type="text/javascript">
+    document.body.className = document.body.className.replace('no-js', 'js');
+    </script>
     <?php
+
     $args = func_get_args();
     $args = array_slice( $args, 1 );
@@ -579 +613 @@
     /** This action is documented in wp-admin/admin-footer.php */
     do_action( 'admin_print_footer_scripts' );
+
     ?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
-</body>
-</html>
+    <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+    </body>
+    </html>
     <?php
 }
@@ -602 +637 @@
 
     $post = get_post();
+
     if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) {
         $post = $GLOBALS['post_ID'];
     }
 
-    wp_enqueue_media(
-        array(
-            'post' => $post,
-        )
-    );
+    wp_enqueue_media( array( 'post' => $post ) );
 
     $img = '<span class="wp-media-buttons-icon"></span> ';
 
     $id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
+
     printf(
         '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
@@ -621 +654 @@
         $img . __( 'Add Media' )
     );
+
     /**
      * Filters the legacy (pre-3.5.0) media buttons.
@@ -710 +744 @@
                 $post['post_content'] = $attachment['post_content'];
             }
+
             if ( isset( $attachment['post_title'] ) ) {
                 $post['post_title'] = $attachment['post_title'];
             }
+
             if ( isset( $attachment['post_excerpt'] ) ) {
                 $post['post_excerpt'] = $attachment['post_excerpt'];
             }
+
             if ( isset( $attachment['menu_order'] ) ) {
                 $post['menu_order'] = $attachment['menu_order'];
@@ -740 +777 @@
             if ( isset( $attachment['image_alt'] ) ) {
                 $image_alt = wp_unslash( $attachment['image_alt'] );
+
                 if ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {
                     $image_alt = wp_strip_all_tags( $image_alt, true );
@@ -772 +810 @@
         </script>
         <?php
+
         exit;
     }
@@ -777 +816 @@
     if ( isset( $send_id ) ) {
         $attachment = wp_unslash( $_POST['attachments'][ $send_id ] );
-
-        $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
+        $html       = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
+
         if ( ! empty( $attachment['url'] ) ) {
             $rel = '';
+
             if ( strpos( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) == $attachment['url'] ) {
                 $rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
             }
+
             $html = "<a href='{$attachment['url']}'$rel>$html</a>";
         }
@@ -799 +840 @@
          */
         $html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment );
+
         return media_send_to_editor( $html );
     }
@@ -821 +863 @@
         $id = media_handle_upload( 'async-upload', $_REQUEST['post_id'] );
         unset( $_FILES );
+
         if ( is_wp_error( $id ) ) {
             $errors['upload_error'] = $id;
@@ -829 +872 @@
     if ( ! empty( $_POST['insertonlybutton'] ) ) {
         $src = $_POST['src'];
+
         if ( ! empty( $src ) && ! strpos( $src, '://' ) ) {
             $src = "http://$src";
@@ -845 +889 @@
             $type = 'file';
             $ext  = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+
             if ( $ext ) {
                 $ext_type = wp_ext2type( $ext );
@@ -868 +913 @@
             $align = '';
             $alt   = esc_attr( wp_unslash( $_POST['alt'] ) );
+
             if ( isset( $_POST['align'] ) ) {
                 $align = esc_attr( wp_unslash( $_POST['align'] ) );
                 $class = " class='align$align'";
             }
+
             if ( ! empty( $src ) ) {
                 $html = "<img src='" . esc_url( $src ) . "' alt='$alt'$class />";
@@ -896 +943 @@
         $errors['upload_notice'] = __( 'Saved.' );
         wp_enqueue_script( 'admin-gallery' );
+
         return wp_iframe( 'media_upload_gallery_form', $errors );
 
@@ -904 +952 @@
             return $return;
         }
+
         if ( is_array( $return ) ) {
             $errors = $return;
@@ -911 +960 @@
     if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'type_url' ) {
         $type = 'image';
+
         if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
             $type = $_GET['type'];
         }
+
         return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
     }
@@ -938 +989 @@
         // Set variables for storage, fix file filename for query strings.
         preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+
         if ( ! $matches ) {
             return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
@@ -976 +1028 @@
         $alt  = isset( $desc ) ? esc_attr( $desc ) : '';
         $html = "<img src='$src' alt='$alt' />";
+
         return $html;
     } else {
@@ -998 +1051 @@
             return $return;
         }
+
         if ( is_array( $return ) ) {
             $errors = $return;
@@ -1016 +1070 @@
 function media_upload_library() {
     $errors = array();
+
     if ( ! empty( $_POST ) ) {
         $return = media_upload_form_handler();
@@ -1051 +1106 @@
         'right'  => __( 'Right' ),
     );
+
     if ( ! array_key_exists( (string) $checked, $alignments ) ) {
         $checked = 'none';
@@ -1056 +1112 @@
 
     $out = array();
+
     foreach ( $alignments as $name => $label ) {
         $name  = esc_attr( $name );
@@ -1062 +1119 @@
             " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
     }
+
     return join( "\n", $out );
 }
@@ -1096 +1154 @@
         $check = get_user_setting( 'imgsize', 'medium' );
     }
+
     $out = array();
 
@@ -1161 +1220 @@
 
     $url = '';
+
     if ( $url_type == 'file' ) {
         $url = $file;
@@ -1268 +1328 @@
 function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
     $post = get_post( $attachment_id );
+
     if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
         $url   = $attachment['url'];
@@ -1294 +1355 @@
         $post = get_post( $post );
     }
+
     if ( is_array( $post ) ) {
         $post = new WP_Post( (object) $post );
@@ -1339 +1401 @@
     foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
         $t = (array) get_taxonomy( $taxonomy );
+
         if ( ! $t['public'] || ! $t['show_ui'] ) {
             continue;
         }
+
         if ( empty( $t['label'] ) ) {
             $t['label'] = $taxonomy;
         }
+
         if ( empty( $t['args'] ) ) {
             $t['args'] = array();
@@ -1350 +1415 @@
 
         $terms = get_object_term_cache( $post->ID, $taxonomy );
+
         if ( false === $terms ) {
             $terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
@@ -1359 +1425 @@
             $values[] = $term->slug;
         }
+
         $t['value'] = join( ', ', $values );
 
@@ -1371 +1438 @@
     if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
         $alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+
         if ( empty( $alt ) ) {
             $alt = '';
@@ -1425 +1493 @@
 function get_media_items( $post_id, $errors ) {
     $attachments = array();
+
     if ( $post_id ) {
         $post = get_post( $post_id );
+
         if ( $post && $post->post_type == 'attachment' ) {
             $attachments = array( $post->ID => $post );
@@ -1452 +1522 @@
             continue;
         }
+
         $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) );
+
         if ( $item ) {
             $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
@@ -1480 +1552 @@
     if ( $attachment_id ) {
         $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true );
+
         if ( $thumb_url ) {
             $thumb_url = $thumb_url[0];
@@ -1526 +1599 @@
         $class        = empty( $parsed_args['errors'] ) ? 'startclosed' : 'startopen';
         $toggle_links = "
-    <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
-    <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
+        <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
+        <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
     } else {
         $class        = '';
@@ -1554 +1627 @@
     $media_dims = '';
     $meta       = wp_get_attachment_metadata( $post->ID );
+
     if ( isset( $meta['width'], $meta['height'] ) ) {
         $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
@@ -1569 +1643 @@
 
     $image_edit_button = '';
+
     if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
         $nonce             = wp_create_nonce( "image_editor-$post->ID" );
@@ -1577 +1652 @@
 
     $item = "
-    $type_html
-    $toggle_links
-    $order
-    $display_title
-    <table class='slidetoggle describe $class'>
-        <thead class='media-item-info' id='media-head-$post->ID'>
-        <tr>
+        $type_html
+        $toggle_links
+        $order
+        $display_title
+        <table class='slidetoggle describe $class'>
+            <thead class='media-item-info' id='media-head-$post->ID'>
+            <tr>
             <td class='A1B1' id='thumbnail-head-$post->ID'>
             <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
@@ -1592 +1667 @@
             <p><strong>" . __( 'File type:' ) . "</strong> $post->post_mime_type</p>
             <p><strong>" . __( 'Upload date:' ) . '</strong> ' . mysql2date( __( 'F j, Y' ), $post->post_date ) . '</p>';
+
     if ( ! empty( $media_dims ) ) {
         $item .= '<p><strong>' . __( 'Dimensions:' ) . "</strong> $media_dims</p>\n";
     }
 
-            $item .= "</td></tr>\n";
+    $item .= "</td></tr>\n";
 
     $item .= "
@@ -1641 +1717 @@
     $thumbnail       = '';
     $calling_post_id = 0;
+
     if ( isset( $_GET['post_id'] ) ) {
         $calling_post_id = absint( $_GET['post_id'] );
@@ -1646 +1723 @@
         $calling_post_id = $post->post_parent;
     }
+
     if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
         && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
@@ -1659 +1737 @@
         $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $parsed_args['send'] . " $thumbnail $delete</td></tr>\n" );
     }
+
     $hidden_fields = array();
 
@@ -1685 +1764 @@
 
         $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+
         if ( ! empty( $field[ $field['input'] ] ) ) {
             $item .= $field[ $field['input'] ];
@@ -1697 +1777 @@
             $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr} />";
         }
+
         if ( ! empty( $field['helps'] ) ) {
             $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
@@ -1728 +1809 @@
         $item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
     }
+
     $item .= "\t</tbody>\n";
     $item .= "\t</table>\n";
@@ -1771 +1853 @@
         foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
             $t = (array) get_taxonomy( $taxonomy );
+
             if ( ! $t['public'] || ! $t['show_ui'] ) {
                 continue;
             }
+
             if ( empty( $t['label'] ) ) {
                 $t['label'] = $taxonomy;
             }
+
             if ( empty( $t['args'] ) ) {
                 $t['args'] = array();
@@ -1782 +1867 @@
 
             $terms = get_object_term_cache( $post->ID, $taxonomy );
+
             if ( false === $terms ) {
                 $terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
@@ -1791 +1877 @@
                 $values[] = $term->slug;
             }
+
             $t['value']    = join( ', ', $values );
             $t['taxonomy'] = true;
@@ -1832 +1919 @@
 
     $item = '';
+
     foreach ( $form_fields as $id => $field ) {
         if ( $id[0] == '_' ) {
@@ -1877 +1965 @@
             $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr} />";
         }
+
         if ( ! empty( $field['helps'] ) ) {
             $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
         }
+
         $item .= "</td>\n\t\t</tr>\n";
 
@@ -1940 +2030 @@
 
     echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
+
     if ( empty( $_GET['chromeless'] ) ) {
         echo '<div id="media-upload-header">';
@@ -1980 +2071 @@
         $max_upload_size = 0;
     }
+
     ?>
-
-<div id="media-upload-notice">
+    <div id="media-upload-notice">
     <?php
 
@@ -1990 +2081 @@
 
     ?>
-</div>
-<div id="media-upload-error">
+    </div>
+    <div id="media-upload-error">
     <?php
 
@@ -1999 +2090 @@
 
     ?>
-</div>
+    </div>
     <?php
+
     if ( is_multisite() && ! is_upload_space_available() ) {
         /**
@@ -2046 +2138 @@
         'file_data_name'   => 'async-upload',
         'url'              => $upload_action_url,
-        'filters'          => array(
-            'max_file_size' => $max_upload_size . 'b',
-        ),
+        'filters'          => array( 'max_file_size' => $max_upload_size . 'b' ),
         'multipart_params' => $post_params,
     );
@@ -2054 +2144 @@
     // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
     // when enabled. See #29602.
-    if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-    strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
-
+    if (
+        wp_is_mobile() &&
+        strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+        strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false
+    ) {
         $plupload_init['multi_selection'] = false;
     }
@@ -2070 +2162 @@
 
     ?>
-
-<script type="text/javascript">
+    <script type="text/javascript">
     <?php
     // Verify size is an int. If not return default value.
     $large_size_h = absint( get_option( 'large_size_h' ) );
+
     if ( ! $large_size_h ) {
         $large_size_h = 1024;
     }
+
     $large_size_w = absint( get_option( 'large_size_w' ) );
+
     if ( ! $large_size_w ) {
         $large_size_w = 1024;
     }
+
     ?>
-var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
-wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
-</script>
-
-<div id="plupload-upload-ui" class="hide-if-no-js">
+    var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+    wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
+    </script>
+
+    <div id="plupload-upload-ui" class="hide-if-no-js">
     <?php
     /**
@@ -2096 +2191 @@
      */
     do_action( 'pre-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
     ?>
-<div id="drag-drop-area">
-    <div class="drag-drop-inside">
-    <p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
-    <p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-    <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
+    <div id="drag-drop-area">
+        <div class="drag-drop-inside">
+        <p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
+        <p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
+        <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
+        </div>
     </div>
-</div>
     <?php
     /**
@@ -2113 +2209 @@
     do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
     ?>
-</div>
-
-<div id="html-upload-ui" class="hide-if-js">
+    </div>
+
+    <div id="html-upload-ui" class="hide-if-js">
     <?php
     /**
@@ -2123 +2219 @@
      */
     do_action( 'pre-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
     ?>
     <p id="async-upload-wrap">
@@ -2138 +2235 @@
      */
     do_action( 'post-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
     ?>
-</div>
+    </div>
 
 <p class="max-upload-size">
@@ -2190 +2288 @@
         $form_class .= ' html-uploader';
     }
+
     ?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-    <?php submit_button( '', 'hidden', 'save', false ); ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-    <?php wp_nonce_field( 'media-form' ); ?>
-
-<h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
+    <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+        <?php submit_button( '', 'hidden', 'save', false ); ?>
+    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+        <?php wp_nonce_field( 'media-form' ); ?>
+
+    <h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
 
     <?php media_upload_form( $errors ); ?>
 
-<script type="text/javascript">
-jQuery(function($){
-    var preloaded = $(".media-item.preloaded");
-    if ( preloaded.length > 0 ) {
-        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-    }
-    updateMediaForm();
-});
-</script>
-<div id="media-items">
+    <script type="text/javascript">
+    jQuery(function($){
+        var preloaded = $(".media-item.preloaded");
+        if ( preloaded.length > 0 ) {
+            preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+        }
+        updateMediaForm();
+    });
+    </script>
+    <div id="media-items">
     <?php
 
@@ -2222 +2320 @@
         }
     }
+
     ?>
-</div>
-
-<p class="savebutton ml-submit">
-    <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
-</p>
-</form>
+    </div>
+
+    <p class="savebutton ml-submit">
+        <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
+    </p>
+    </form>
     <?php
 }
@@ -2258 +2357 @@
         $form_class .= ' html-uploader';
     }
+
     ?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-    <?php wp_nonce_field( 'media-form' ); ?>
-
-<h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
-
-<script type="text/javascript">
-var addExtImage = {
+    <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+        <?php wp_nonce_field( 'media-form' ); ?>
+
+    <h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
+
+    <script type="text/javascript">
+    var addExtImage = {
 
     width : '',
@@ -2282 +2381 @@
             alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
-    <?php
-    /** This filter is documented in wp-admin/includes/media.php */
-    if ( ! apply_filters( 'disable_captions', '' ) ) {
+        <?php
+        /** This filter is documented in wp-admin/includes/media.php */
+        if ( ! apply_filters( 'disable_captions', '' ) ) {
+            ?>
+            if ( f.caption.value ) {
+                caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+                caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+                    return a.replace(/[\r\n\t]+/, ' ');
+                });
+
+                caption = caption.replace(/\s*\n\s*/g, '<br />');
+            }
+            <?php
+        }
+
         ?>
-    if ( f.caption.value ) {
-        caption = f.caption.value.replace(/\r\n|\r/g, '\n');
-        caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
-            return a.replace(/[\r\n\t]+/, ' ');
-        });
-
-        caption = caption.replace(/\s*\n\s*/g, '<br />');
-    }
-    <?php } ?>
-
         cls = caption ? '' : ' class="'+t.align+'"';
 
@@ -2349 +2450 @@
         t.preloadImg.src = src;
     }
-};
-
-jQuery(document).ready( function($) {
-    $('.media-types input').click( function() {
-        $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+    };
+
+    jQuery(document).ready( function($) {
+        $('.media-types input').click( function() {
+            $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+        });
     });
-});
-</script>
-
-<div id="media-items">
-<div class="media-item media-blank">
+    </script>
+
+    <div id="media-items">
+    <div class="media-item media-blank">
     <?php
     /**
@@ -2369 +2470 @@
      */
     echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+
     ?>
-</div>
-</div>
-</form>
+    </div>
+    </div>
+    </form>
     <?php
 }
@@ -2402 +2504 @@
         $form_class .= ' html-uploader';
     }
+
     ?>
-
-<script type="text/javascript">
-jQuery(function($){
-    var preloaded = $(".media-item.preloaded");
-    if ( preloaded.length > 0 ) {
-        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-        updateMediaForm();
-    }
-});
-</script>
-<div id="sort-buttons" class="hide-if-no-js">
-<span>
-    <?php _e( 'All Tabs:' ); ?>
-<a href="#" id="showall"><?php _e( 'Show' ); ?></a>
-<a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
-</span>
-    <?php _e( 'Sort Order:' ); ?>
-<a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
-<a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
-<a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
-</div>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
-    <?php wp_nonce_field( 'media-form' ); ?>
-    <?php //media_upload_form( $errors ); ?>
-<table class="widefat">
-<thead><tr>
-<th><?php _e( 'Media' ); ?></th>
-<th class="order-head"><?php _e( 'Order' ); ?></th>
-<th class="actions-head"><?php _e( 'Actions' ); ?></th>
-</tr></thead>
-</table>
-<div id="media-items">
-    <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-    <?php echo get_media_items( $post_id, $errors ); ?>
-</div>
-
-<p class="ml-submit">
-    <?php
-    submit_button(
-        __( 'Save all changes' ),
-        'savebutton',
-        'save',
-        false,
-        array(
-            'id'    => 'save-all',
-            'style' => 'display: none;',
-        )
-    );
-    ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
-</p>
-
-<div id="gallery-settings" style="display:none;">
-<div class="title"><?php _e( 'Gallery Settings' ); ?></div>
-<table id="basic" class="describe"><tbody>
-    <tr>
-    <th scope="row" class="label">
-        <label>
-        <span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
-        </label>
-    </th>
-    <td class="field">
-        <input type="radio" name="linkto" id="linkto-file" value="file" />
-        <label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
-
-        <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
-        <label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
-    </td>
-    </tr>
-
-    <tr>
-    <th scope="row" class="label">
-        <label>
-        <span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
-        </label>
-    </th>
-    <td class="field">
-        <select id="orderby" name="orderby">
-            <option value="menu_order" selected="selected"><?php _e( 'Menu order' ); ?></option>
-            <option value="title"><?php _e( 'Title' ); ?></option>
-            <option value="post_date"><?php _e( 'Date/Time' ); ?></option>
-            <option value="rand"><?php _e( 'Random' ); ?></option>
-        </select>
-    </td>
-    </tr>
-
-    <tr>
-    <th scope="row" class="label">
-        <label>
-        <span class="alignleft"><?php _e( 'Order:' ); ?></span>
-        </label>
-    </th>
-    <td class="field">
-        <input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
-        <label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
-
-        <input type="radio" name="order" id="order-desc" value="desc" />
-        <label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
-    </td>
-    </tr>
-
-    <tr>
-    <th scope="row" class="label">
-        <label>
-        <span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
-        </label>
-    </th>
-    <td class="field">
-        <select id="columns" name="columns">
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3" selected="selected">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-            <option value="6">6</option>
-            <option value="7">7</option>
-            <option value="8">8</option>
-            <option value="9">9</option>
-        </select>
-    </td>
-    </tr>
-</tbody></table>
-
-<p class="ml-submit">
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
-</p>
-</div>
-</form>
+    <script type="text/javascript">
+    jQuery(function($){
+        var preloaded = $(".media-item.preloaded");
+        if ( preloaded.length > 0 ) {
+            preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+            updateMediaForm();
+        }
+    });
+    </script>
+    <div id="sort-buttons" class="hide-if-no-js">
+    <span>
+        <?php _e( 'All Tabs:' ); ?>
+    <a href="#" id="showall"><?php _e( 'Show' ); ?></a>
+    <a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
+    </span>
+        <?php _e( 'Sort Order:' ); ?>
+    <a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
+    <a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
+    <a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
+    </div>
+    <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
+        <?php wp_nonce_field( 'media-form' ); ?>
+        <?php //media_upload_form( $errors ); ?>
+    <table class="widefat">
+    <thead><tr>
+    <th><?php _e( 'Media' ); ?></th>
+    <th class="order-head"><?php _e( 'Order' ); ?></th>
+    <th class="actions-head"><?php _e( 'Actions' ); ?></th>
+    </tr></thead>
+    </table>
+    <div id="media-items">
+        <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+        <?php echo get_media_items( $post_id, $errors ); ?>
+    </div>
+
+    <p class="ml-submit">
+        <?php
+        submit_button(
+            __( 'Save all changes' ),
+            'savebutton',
+            'save',
+            false,
+            array(
+                'id'    => 'save-all',
+                'style' => 'display: none;',
+            )
+        );
+        ?>
+    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+    <input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
+    <input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
+    </p>
+
+    <div id="gallery-settings" style="display:none;">
+    <div class="title"><?php _e( 'Gallery Settings' ); ?></div>
+    <table id="basic" class="describe"><tbody>
+        <tr>
+        <th scope="row" class="label">
+            <label>
+            <span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
+            </label>
+        </th>
+        <td class="field">
+            <input type="radio" name="linkto" id="linkto-file" value="file" />
+            <label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
+
+            <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
+            <label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
+        </td>
+        </tr>
+
+        <tr>
+        <th scope="row" class="label">
+            <label>
+            <span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
+            </label>
+        </th>
+        <td class="field">
+            <select id="orderby" name="orderby">
+                <option value="menu_order" selected="selected"><?php _e( 'Menu order' ); ?></option>
+                <option value="title"><?php _e( 'Title' ); ?></option>
+                <option value="post_date"><?php _e( 'Date/Time' ); ?></option>
+                <option value="rand"><?php _e( 'Random' ); ?></option>
+            </select>
+        </td>
+        </tr>
+
+        <tr>
+        <th scope="row" class="label">
+            <label>
+            <span class="alignleft"><?php _e( 'Order:' ); ?></span>
+            </label>
+        </th>
+        <td class="field">
+            <input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
+            <label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
+
+            <input type="radio" name="order" id="order-desc" value="desc" />
+            <label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
+        </td>
+        </tr>
+
+        <tr>
+        <th scope="row" class="label">
+            <label>
+            <span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
+            </label>
+        </th>
+        <td class="field">
+            <select id="columns" name="columns">
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3" selected="selected">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
+                <option value="6">6</option>
+                <option value="7">7</option>
+                <option value="8">8</option>
+                <option value="9">9</option>
+            </select>
+        </td>
+        </tr>
+    </tbody></table>
+
+    <p class="ml-submit">
+    <input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
+    <input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+    </p>
+    </div>
+    </form>
     <?php
 }
@@ -2581 +2683 @@
 
     ?>
-
-<form id="filter" method="get">
-<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
-<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
-<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
-
-<p id="media-search" class="search-box">
-    <label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
-    <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
-    <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
-</p>
-
-<ul class="subsubsub">
-    <?php
-    $type_links = array();
-    $_num_posts = (array) wp_count_attachments();
-    $matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
-    foreach ( $matches as $_type => $reals ) {
-        foreach ( $reals as $real ) {
-            if ( isset( $num_posts[ $_type ] ) ) {
-                $num_posts[ $_type ] += $_num_posts[ $real ];
-            } else {
-                $num_posts[ $_type ] = $_num_posts[ $real ];
-            }
-        }
-    }
-    // If available type specified by media button clicked, filter by that type
-    if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
-        $_GET['post_mime_type']                        = $type;
-        list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-    }
-    if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
-        $class = ' class="current"';
-    } else {
-        $class = '';
-    }
-    $type_links[] = '<li><a href="' . esc_url(
-        add_query_arg(
-            array(
-                'post_mime_type' => 'all',
-                'paged'          => false,
-                'm'              => false,
-            )
-        )
-    ) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
-    foreach ( $post_mime_types as $mime_type => $label ) {
-        $class = '';
-
-        if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
-            continue;
-        }
-
-        if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+    <form id="filter" method="get">
+    <input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
+    <input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
+    <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
+    <input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
+    <input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
+
+    <p id="media-search" class="search-box">
+        <label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
+        <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+        <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
+    </p>
+
+    <ul class="subsubsub">
+        <?php
+        $type_links = array();
+        $_num_posts = (array) wp_count_attachments();
+        $matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
+        foreach ( $matches as $_type => $reals ) {
+            foreach ( $reals as $real ) {
+                if ( isset( $num_posts[ $_type ] ) ) {
+                    $num_posts[ $_type ] += $_num_posts[ $real ];
+                } else {
+                    $num_posts[ $_type ] = $_num_posts[ $real ];
+                }
+            }
+        }
+        // If available type specified by media button clicked, filter by that type
+        if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
+            $_GET['post_mime_type']                        = $type;
+            list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
+        }
+        if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
             $class = ' class="current"';
-        }
-
+        } else {
+            $class = '';
+        }
         $type_links[] = '<li><a href="' . esc_url(
             add_query_arg(
                 array(
-                    'post_mime_type' => $mime_type,
+                    'post_mime_type' => 'all',
                     'paged'          => false,
+                    'm'              => false,
                 )
             )
-        ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
-    }
-    /**
-     * Filters the media upload mime type list items.
-     *
-     * Returned values should begin with an `<li>` tag.
-     *
-     * @since 3.1.0
-     *
-     * @param string[] $type_links An array of list items containing mime type link HTML.
-     */
-    echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
-    unset( $type_links );
-    ?>
-</ul>
-
-<div class="tablenav">
-
-    <?php
-    $page_links = paginate_links(
-        array(
-            'base'      => add_query_arg( 'paged', '%#%' ),
-            'format'    => '',
-            'prev_text' => __( '&laquo;' ),
-            'next_text' => __( '&raquo;' ),
-            'total'     => ceil( $wp_query->found_posts / 10 ),
-            'current'   => $q['paged'],
-        )
-    );
-
-    if ( $page_links ) {
-        echo "<div class='tablenav-pages'>$page_links</div>";
-    }
-    ?>
-
-<div class="alignleft actions">
-    <?php
-
-    $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-    $arc_result = $wpdb->get_results( $arc_query );
-
-    $month_count    = count( $arc_result );
-    $selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
-
-    if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+        ) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
+        foreach ( $post_mime_types as $mime_type => $label ) {
+            $class = '';
+
+            if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+                continue;
+            }
+
+            if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+                $class = ' class="current"';
+            }
+
+            $type_links[] = '<li><a href="' . esc_url(
+                add_query_arg(
+                    array(
+                        'post_mime_type' => $mime_type,
+                        'paged'          => false,
+                    )
+                )
+            ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
+        }
+        /**
+         * Filters the media upload mime type list items.
+         *
+         * Returned values should begin with an `<li>` tag.
+         *
+         * @since 3.1.0
+         *
+         * @param string[] $type_links An array of list items containing mime type link HTML.
+         */
+        echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+        unset( $type_links );
         ?>
-<select name='m'>
-<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+    </ul>
+
+    <div class="tablenav">
+
         <?php
-        foreach ( $arc_result as $arc_row ) {
-            if ( $arc_row->yyear == 0 ) {
-                continue;
-            }
-            $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-            if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
-                $default = ' selected="selected"';
-            } else {
-                $default = '';
-            }
-
-            echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-            echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
-            echo "</option>\n";
+        $page_links = paginate_links(
+            array(
+                'base'      => add_query_arg( 'paged', '%#%' ),
+                'format'    => '',
+                'prev_text' => __( '&laquo;' ),
+                'next_text' => __( '&raquo;' ),
+                'total'     => ceil( $wp_query->found_posts / 10 ),
+                'current'   => $q['paged'],
+            )
+        );
+
+        if ( $page_links ) {
+            echo "<div class='tablenav-pages'>$page_links</div>";
         }
         ?>
-</select>
-    <?php } ?>
-
-    <?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
-
-</div>
-
-<br class="clear" />
-</div>
-</form>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
-
+
+    <div class="alignleft actions">
+        <?php
+
+        $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
+
+        $arc_result = $wpdb->get_results( $arc_query );
+
+        $month_count    = count( $arc_result );
+        $selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
+
+        if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+            ?>
+            <select name='m'>
+            <option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+            <?php
+
+            foreach ( $arc_result as $arc_row ) {
+                if ( $arc_row->yyear == 0 ) {
+                    continue;
+                }
+
+                $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+
+                if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+                    $default = ' selected="selected"';
+                } else {
+                    $default = '';
+                }
+
+                echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+                echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
+                echo "</option>\n";
+            }
+
+            ?>
+            </select>
+        <?php } ?>
+
+        <?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
+
+    </div>
+
+    <br class="clear" />
+    </div>
+    </form>
+
+    <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
     <?php wp_nonce_field( 'media-form' ); ?>
     <?php //media_upload_form( $errors ); ?>
 
-<script type="text/javascript">
-<!--
-jQuery(function($){
-    var preloaded = $(".media-item.preloaded");
-    if ( preloaded.length > 0 ) {
-        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-        updateMediaForm();
-    }
-});
--->
-</script>
-
-<div id="media-items">
-    <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-    <?php echo get_media_items( null, $errors ); ?>
-</div>
-<p class="ml-submit">
-    <?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-</p>
-</form>
+    <script type="text/javascript">
+    jQuery(function($){
+        var preloaded = $(".media-item.preloaded");
+        if ( preloaded.length > 0 ) {
+            preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+            updateMediaForm();
+        }
+    });
+    </script>
+
+    <div id="media-items">
+        <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+        <?php echo get_media_items( null, $errors ); ?>
+    </div>
+    <p class="ml-submit">
+        <?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
+    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+    </p>
+    </form>
     <?php
 }
@@ -2770 +2871 @@
             </th>
             <td class="field"><textarea id="caption" name="caption"></textarea></td>
-        </tr>
-';
+        </tr>';
     } else {
         $caption = '';
@@ -2777 +2877 @@
 
     $default_align = get_option( 'image_default_align' );
+
     if ( empty( $default_align ) ) {
         $default_align = 'none';
@@ -2857 +2958 @@
             </td>
         </tr>
-    </tbody></table>
-';
-
+    </tbody></table>';
 }
 
@@ -2927 +3026 @@
         $end = '</a>';
     }
+
     ?>
-<p class="hide-if-no-js"><label>
-<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
+    <p class="hide-if-no-js"><label>
+    <input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
     <?php
     /* translators: 1: Link start tag, 2: Link end tag, 3: Width, 4: Height. */
     printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+
     ?>
-</label></p>
+    </label></p>
     <?php
 }
@@ -2960 +3061 @@
 function edit_form_image_editor( $post ) {
     $open = isset( $_GET['image-editor'] );
+
     if ( $open ) {
         require_once ABSPATH . 'wp-admin/includes/image-edit.php';
@@ -2966 +3068 @@
     $thumb_url     = false;
     $attachment_id = intval( $post->ID );
+
     if ( $attachment_id ) {
         $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
@@ -2976 +3079 @@
     <div class="wp_attachment_holder wp-clearfix">
     <?php
+
     if ( wp_attachment_is_image( $post->ID ) ) :
         $image_edit_button = '';
@@ -2985 +3089 @@
         $open_style     = '';
         $not_open_style = '';
+
         if ( $open ) {
             $open_style = ' style="display:none"';
@@ -2990 +3095 @@
             $not_open_style = ' style="display:none"';
         }
+
         ?>
-
         <div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
@@ -2999 +3104 @@
         </div>
         <div<?php echo $not_open_style; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-            <?php
-            if ( $open ) {
-                wp_image_editor( $attachment_id );}
-            ?>
+        <?php
+
+        if ( $open ) {
+            wp_image_editor( $attachment_id );
+        }
+
+        ?>
         </div>
         <?php
@@ -3018 +3126 @@
         $w    = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
         $h    = ! empty( $meta['height'] ) ? $meta['height'] : 0;
+
         if ( $h && $w < $meta['width'] ) {
             $h = round( ( $meta['height'] * $w ) / $meta['width'] );
@@ -3023 +3132 @@
 
         $attr = array( 'src' => $att_url );
+
         if ( ! empty( $w ) && ! empty( $h ) ) {
             $attr['width']  = $w;
@@ -3029 +3139 @@
 
         $thumb_id = get_post_thumbnail_id( $attachment_id );
+
         if ( ! empty( $thumb_id ) ) {
             $attr['poster'] = wp_get_attachment_url( $thumb_id );
@@ -3036 +3147 @@
 
     elseif ( isset( $thumb_url[0] ) ) :
-
         ?>
         <div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
@@ -3057 +3167 @@
 
     endif;
+
     ?>
     </div>
@@ -3066 +3177 @@
         </p>
         <p class="attachment-alt-text-description" id="alt-text-description">
-            <?php
-            printf(
-                /* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
-                __( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
-                esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
-                'target="_blank" rel="noopener noreferrer"',
-                sprintf(
-                    '<span class="screen-reader-text"> %s</span>',
-                    /* translators: Accessibility text. */
-                    __( '(opens in a new tab)' )
-                )
-            );
-            ?>
+        <?php
+
+        printf(
+            /* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
+            __( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
+            esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
+            'target="_blank" rel="noopener noreferrer"',
+            sprintf(
+                '<span class="screen-reader-text"> %s</span>',
+                /* translators: Accessibility text. */
+                __( '(opens in a new tab)' )
+            )
+        );
+
+        ?>
         </p>
     <?php endif; ?>
@@ -3088 +3201 @@
 
     <?php
-        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-        $editor_args        = array(
-            'textarea_name' => 'content',
-            'textarea_rows' => 5,
-            'media_buttons' => false,
-            'tinymce'       => false,
-            'quicktags'     => $quicktags_settings,
-        );
+
+    $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+    $editor_args        = array(
+        'textarea_name' => 'content',
+        'textarea_rows' => 5,
+        'media_buttons' => false,
+        'tinymce'       => false,
+        'quicktags'     => $quicktags_settings,
+    );
+
     ?>
 
     <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
-        <?php
-        if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
-            echo ': ' . __( 'Displayed on attachment pages.' );
-        }
-        ?>
+    <?php
+
+    if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
+        echo ': ' . __( 'Displayed on attachment pages.' );
+    }
+
+    ?>
     </label>
     <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
@@ -3109 +3226 @@
     </div>
     <?php
+
     $extras = get_compat_media_markup( $post->ID );
     echo $extras['item'];
@@ -3120 +3238 @@
  */
 function attachment_submitbox_metadata() {
-    $post = get_post();
-
-    $file     = get_attached_file( $post->ID );
+    $post          = get_post();
+    $attachment_id = $post->ID;
+
+    $file     = get_attached_file( $attachment_id );
     $filename = esc_html( wp_basename( $file ) );
 
     $media_dims = '';
-    $meta       = wp_get_attachment_metadata( $post->ID );
+    $meta       = wp_get_attachment_metadata( $attachment_id );
+
     if ( isset( $meta['width'], $meta['height'] ) ) {
-        $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+        $media_dims .= "<span id='media-dims-$attachment_id'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
     }
     /** This filter is documented in wp-admin/includes/media.php */
     $media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
-    $att_url = wp_get_attachment_url( $post->ID );
+    $att_url = wp_get_attachment_url( $attachment_id );
+
     ?>
     <div class="misc-pub-section misc-pub-attachment">
@@ -3143 +3264 @@
     </div>
     <div class="misc-pub-section misc-pub-filetype">
-        <?php _e( 'File type:' ); ?> <strong>
-                    <?php
-                    if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
-                        echo esc_html( strtoupper( $matches[1] ) );
-                        list( $mime_type ) = explode( '/', $post->post_mime_type );
-                        if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
-                            if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
-                                echo ' (' . $meta['mime_type'] . ')';
-                            }
-                        }
-                    } else {
-                        echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
-                    }
-                    ?>
+        <?php _e( 'File type:' ); ?>
+        <strong>
+        <?php
+
+        if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
+            echo esc_html( strtoupper( $matches[1] ) );
+            list( $mime_type ) = explode( '/', $post->post_mime_type );
+            if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
+                if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
+                    echo ' (' . $meta['mime_type'] . ')';
+                }
+            }
+        } else {
+            echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+        }
+
+        ?>
         </strong>
     </div>
 
     <?php
-        $file_size = false;
+
+    $file_size = false;
 
     if ( isset( $meta['filesize'] ) ) {
@@ -3169 +3294 @@
     }
 
-    if ( ! empty( $file_size ) ) :
+    if ( ! empty( $file_size ) ) {
         ?>
-            <div class="misc-pub-section misc-pub-filesize">
-                <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
-            </div>
-            <?php
-        endif;
+        <div class="misc-pub-section misc-pub-filesize">
+            <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+        </div>
+        <?php
+    }
 
     if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
@@ -3201 +3326 @@
                 continue;
             }
+
             ?>
-        <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-            <?php echo $label; ?> <strong>
-                        <?php
-                        switch ( $key ) {
-                            case 'bitrate':
-                                echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
-                                if ( ! empty( $meta['bitrate_mode'] ) ) {
-                                    echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
-                                }
-                                break;
-                            default:
-                                echo esc_html( $meta[ $key ] );
-                                break;
+            <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                <?php echo $label; ?>
+                <strong>
+                <?php
+
+                switch ( $key ) {
+                    case 'bitrate':
+                        echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
+                        if ( ! empty( $meta['bitrate_mode'] ) ) {
+                            echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
                         }
-                        ?>
-            </strong>
-        </div>
+                        break;
+                    default:
+                        echo esc_html( $meta[ $key ] );
+                        break;
+                }
+
+                ?>
+                </strong>
+            </div>
             <?php
         }
@@ -3245 +3374 @@
                 continue;
             }
+
             ?>
-        <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-            <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
+            <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
+            </div>
+            <?php
+        }
+    }
+
+    if ( $media_dims ) {
+        ?>
+        <div class="misc-pub-section misc-pub-dimensions">
+            <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
         </div>
-            <?php
-        }
-    }
-
-    if ( $media_dims ) :
-        ?>
-    <div class="misc-pub-section misc-pub-dimensions">
-        <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
-    </div>
         <?php
-    endif;
+    }
 }
 
@@ -3329 +3459 @@
         require( ABSPATH . WPINC . '/ID3/getid3.php' );
     }
+
     $id3  = new getID3();
     $data = $id3->analyze( $file );
@@ -3335 +3466 @@
         $metadata['lossless'] = $data['video']['lossless'];
     }
+
     if ( ! empty( $data['video']['bitrate'] ) ) {
         $metadata['bitrate'] = (int) $data['video']['bitrate'];
     }
+
     if ( ! empty( $data['video']['bitrate_mode'] ) ) {
         $metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
     }
+
     if ( ! empty( $data['filesize'] ) ) {
         $metadata['filesize'] = (int) $data['filesize'];
     }
+
     if ( ! empty( $data['mime_type'] ) ) {
         $metadata['mime_type'] = $data['mime_type'];
     }
+
     if ( ! empty( $data['playtime_seconds'] ) ) {
         $metadata['length'] = (int) round( $data['playtime_seconds'] );
     }
+
     if ( ! empty( $data['playtime_string'] ) ) {
         $metadata['length_formatted'] = $data['playtime_string'];
     }
+
     if ( ! empty( $data['video']['resolution_x'] ) ) {
         $metadata['width'] = (int) $data['video']['resolution_x'];
     }
+
     if ( ! empty( $data['video']['resolution_y'] ) ) {
         $metadata['height'] = (int) $data['video']['resolution_y'];
     }
+
     if ( ! empty( $data['fileformat'] ) ) {
         $metadata['fileformat'] = $data['fileformat'];
     }
+
     if ( ! empty( $data['video']['dataformat'] ) ) {
         $metadata['dataformat'] = $data['video']['dataformat'];
     }
+
     if ( ! empty( $data['video']['encoder'] ) ) {
         $metadata['encoder'] = $data['video']['encoder'];
     }
+
     if ( ! empty( $data['video']['codec'] ) ) {
         $metadata['codec'] = $data['video']['codec'];
@@ -3417 +3560 @@
         return false;
     }
+
     $metadata = array();
 
@@ -3426 +3570 @@
         require( ABSPATH . WPINC . '/ID3/getid3.php' );
     }
+
     $id3  = new getID3();
     $data = $id3->analyze( $file );
@@ -3437 +3582 @@
         $metadata['fileformat'] = $data['fileformat'];
     }
+
     if ( ! empty( $data['filesize'] ) ) {
         $metadata['filesize'] = (int) $data['filesize'];
     }
+
     if ( ! empty( $data['mime_type'] ) ) {
         $metadata['mime_type'] = $data['mime_type'];
     }
+
     if ( ! empty( $data['playtime_seconds'] ) ) {
         $metadata['length'] = (int) round( $data['playtime_seconds'] );
     }
+
     if ( ! empty( $data['playtime_string'] ) ) {
         $metadata['length_formatted'] = $data['playtime_string'];
@@ -3532 +3681 @@
         wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
     }
+
     $ids = array();
+
     foreach ( (array) $_REQUEST['media'] as $att_id ) {
         $att_id = (int) $att_id;
@@ -3545 +3696 @@
     if ( ! empty( $ids ) ) {
         $ids_string = implode( ',', $ids );
+
         if ( 'attach' === $action ) {
             $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
@@ -3559 +3711 @@
         $location = 'upload.php';
         $referer  = wp_get_referer();
+
         if ( $referer ) {
             if ( false !== strpos( $referer, 'upload.php' ) ) {
@@ -3567 +3720 @@
         $key      = 'attach' === $action ? 'attached' : 'detach';
         $location = add_query_arg( array( $key => $result ), $location );
+
         wp_redirect( $location );
         exit;