Ticket #9393: 9393-media-fixes.2.diff

wp-admin/media.php

@@ -94 +94 @@
 
 <p class="submit">
 <input type="submit" class="button-primary" name="save" value="<?php _e('Update Media'); ?>" />
-<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
+<input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? $post_id : ''; ?>" />
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $att_id; ?>" />
 <input type="hidden" name="action" value="editattachment" />
 <?php wp_original_referer_field(true, 'previous'); ?>

wp-admin/includes/media.php

@@ -397 +397 @@
                 if ( isset($post['errors']) ) {
                         $errors[$attachment_id] = $post['errors'];
                         unset($post['errors']);
+                } else {
+                        $errors = array();
                 }
 
                 if ( $post != $_post )
@@ -988 +990 @@
                         'label'      => __('File URL'),
                         'input'      => 'html',
                         'html'       => "<input type='text' class='urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . attribute_escape($image_url) . "' /><br />",
-                        'value'      => $edit_post->post_url,
+                        'value'      => isset($edit_post->post_url) ? $edit_post->post_url : '',
                         'helps'      => __('Location of the uploaded file.'),
                 )
         );
@@ -1223 +1225 @@
         foreach ( $hidden_fields as $name => $value )
                 $item .= "\t<input type='hidden' name='$name' id='$name' value='" . attribute_escape( $value ) . "' />\n";
 
-        if ( $post->post_parent < 1 && (int) $_REQUEST['post_id'] ) {
+        if ( $post->post_parent < 1 &&  isset($_REQUEST['post_id']) ) {
                 $parent = (int) $_REQUEST['post_id'];
                 $parent_name = "attachments[$attachment_id][post_parent]";
 
@@ -1701 +1703 @@
 <input type="hidden" name="type" value="<?php echo attribute_escape( $type ); ?>" />
 <input type="hidden" name="tab" value="<?php echo attribute_escape( $tab ); ?>" />
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
+<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? attribute_escape( $_GET['post_mime_type'] ) : ''; ?>" />
 
 <p id="media-search" class="search-box">
         <label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label>
@@ -1716 +1718 @@
 $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
 foreach ( $matches as $_type => $reals )
         foreach ( $reals as $real )
-                $num_posts[$_type] += $_num_posts[$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;
@@ -1724 +1729 @@
 }
 if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
         $class = ' class="current"';
+else
+        $class = '';
 $type_links[] = "<li><a href='" . clean_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 = '';
@@ -1731 +1738 @@
         if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
                 continue;
 
-        if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
+        if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
                 $class = ' class="current"';
 
         $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';