Changeset 12375 for trunk/wp-admin/upload.php

Timestamp:

12/11/2009 11:14:43 PM (16 years ago)

Author:

ryan

Message:

Don't fallback to the options database when retrieving *_per_page user options. Props nacin. fixes #11385

File:

• trunk/wp-admin/upload.php (modified) (1 diff)

trunk/wp-admin/upload.php

@@ -135 +135 @@
 if ( isset($_GET['detached']) ) {
 
-    $media_per_page = (int) get_user_option('upload_per_page');
-    if ( empty($media_per_page) )
+    $media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
+    if ( empty($media_per_page) || $media_per_page < 1 )
         $media_per_page = 20;
+    $media_per_page = apply_filters( 'upload_per_page', $media_per_page );
 
     if ( !empty($lost) ) {