Changes in trunk/wp-admin/upload.php [12162:12308]

File:

• trunk/wp-admin/upload.php (modified) (9 diffs)

trunk/wp-admin/upload.php

@@ -63 +63 @@
         }
 
-        $location = add_query_arg( array( 'detached' => 1, 'attached' => $attached ) , $location );
+        $location = add_query_arg( array( 'attached' => $attached ) , $location );
         wp_redirect($location);
         exit;
@@ -77 +77 @@
         $post_ids = isset($_GET['media']) ? $_GET['media'] : explode(',', $_GET['ids']);
         $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
-    } else
+    } else {
         wp_redirect($_SERVER['HTTP_REFERER']);
+    }
 
     $location = 'upload.php';
     if ( $referer = wp_get_referer() ) {
         if ( false !== strpos($referer, 'upload.php') )
-            $location = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'message', 'ids'), $referer );
+            $location = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer );
     }
 
@@ -119 +120 @@
     }
 
-    $location = remove_query_arg('posted', $location);
     wp_redirect($location);
     exit;
@@ -135 +135 @@
 if ( isset($_GET['detached']) ) {
 
+    $media_per_page = (int) get_user_option('upload_per_page');
+    if ( empty($media_per_page) )
+        $media_per_page = 20;
+
     if ( !empty($lost) ) {
-        $start = ( $_GET['paged'] - 1 ) * 50;
-        $page_links_total = ceil(count($lost) / 50);
+        $start = ( (int) $_GET['paged'] - 1 ) * $media_per_page;
+        $page_links_total = ceil(count($lost) / $media_per_page);
         $lost = implode(',', $lost);
 
-        $orphans = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE post_type = 'attachment' AND ID IN ($lost) LIMIT $start, 50" );
+        $orphans = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_type = 'attachment' AND ID IN (%s) LIMIT %d, %d", $lost, $start, $media_per_page ) );
     } else {
-        $start = ( $_GET['paged'] - 1 ) * 25;
-        $orphans = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1 LIMIT $start, 25" );
-        $page_links_total = ceil($wpdb->get_var( "SELECT FOUND_ROWS()" ) / 25);
+        $start = ( (int) $_GET['paged'] - 1 ) * $media_per_page;
+        $orphans = $wpdb->get_results( $wpdb->prepare( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1 LIMIT %d, %d", $start, $media_per_page ) );
+        $page_links_total = ceil($wpdb->get_var( "SELECT FOUND_ROWS()" ) / $media_per_page);
     }
 
@@ -167 +171 @@
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
     printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
@@ -203 +207 @@
 $messages[2] = __('Media permanently deleted.');
 $messages[3] = __('Error saving media attachment.');
-$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.$_GET['ids'], "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
+$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
 $messages[5] = __('Media restored from the trash.');
 
@@ -305 +309 @@
     if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) : ?>
 <select name='m'>
-<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
+<option value='0'><?php _e('Show all dates'); ?></option>
 <?php
 foreach ($arc_result as $arc_row) {
@@ -430 +434 @@
 </table>
 
-<?php find_posts_div();
+<?php
 
 } else {
@@ -467 +471 @@
 <br class="clear" />
 </div>
+<?php find_posts_div(); ?>
 </form>
 <br class="clear" />