Changeset 12616

Timestamp:

01/07/2010 12:01:52 AM (16 years ago)

Author:

ryan

Message:

Deprecate argument. Never fallback to options table for user option requests. Props nacin. fixes #11615

Location:

trunk

Files:

• wp-admin/categories.php (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/includes/template.php (modified) (4 diffs)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-admin/categories.php

@@ -167 +167 @@
     $pagenum = 1;
 
-$cats_per_page = (int) get_user_option( 'categories_per_page', 0, false );
+$cats_per_page = (int) get_user_option( 'categories_per_page' );
 if ( empty( $cats_per_page ) || $cats_per_page < 1 )
     $cats_per_page = 20;

trunk/wp-admin/edit-comments.php

@@ -227 +227 @@
 
 <?php
-$comments_per_page = (int) get_user_option( 'edit_comments_per_page', 0, false );
+$comments_per_page = (int) get_user_option( 'edit_comments_per_page' );
 if ( empty( $comments_per_page ) || $comments_per_page < 1 )
     $comments_per_page = 20;

trunk/wp-admin/edit-pages.php

@@ -229 +229 @@
 if ( empty($pagenum) )
     $pagenum = 1;
-$per_page = (int) get_user_option( 'edit_pages_per_page', 0, false );
+$per_page = (int) get_user_option( 'edit_pages_per_page' );
 if ( empty( $per_page ) || $per_page < 1 )
     $per_page = 20;

trunk/wp-admin/edit-tags.php

@@ -195 +195 @@
     $pagenum = 1;
 
-$tags_per_page = (int) get_user_option( 'edit_tags_per_page', 0, false );
+$tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
 if ( empty($tags_per_page) || $tags_per_page < 1 )
     $tags_per_page = 20;

trunk/wp-admin/includes/post.php

@@ -852 +852 @@
 
 
-    $posts_per_page = (int) get_user_option( 'edit_per_page', 0, false );
+    $posts_per_page = (int) get_user_option( 'edit_per_page' );
     if ( empty( $posts_per_page ) || $posts_per_page < 1 )
         $posts_per_page = 15;
@@ -910 +910 @@
     $q['post_type'] = 'attachment';
     $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit';
-    $media_per_page = (int) get_user_option( 'upload_per_page', 0, false );
+    $media_per_page = (int) get_user_option( 'upload_per_page' );
     if ( empty( $media_per_page ) || $media_per_page < 1 )
         $media_per_page = 20;
@@ -940 +940 @@
         return '';
     $current_user = wp_get_current_user();
-    if ( $closed = get_user_option('closedpostboxes_'.$page, 0, false ) ) {
+    if ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
         if ( !is_array( $closed ) ) {
             return '';

trunk/wp-admin/includes/template.php

@@ -984 +984 @@
 function get_hidden_columns($page) {
     $page = str_replace('.php', '', $page);
-    return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false );
+    return (array) get_user_option( 'manage-' . $page . '-columns-hidden' );
 }
 
@@ -2988 +2988 @@
     do {
         // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page", 0, false ) ) {
+        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
             foreach ( $sorted as $box_context => $ids )
                 foreach ( explode(',', $ids) as $id )
@@ -3082 +3082 @@
 
 function get_hidden_meta_boxes($page) {
-    $hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false );
+    $hidden = (array) get_user_option( "meta-box-hidden_$page" );
 
     // Hide slug boxes by default
@@ -3738 +3738 @@
 
     $option = str_replace( '-', '_', "${screen}_per_page" );
-    $per_page = (int) get_user_option( $option, 0, false );
+    $per_page = (int) get_user_option( $option );
     if ( empty( $per_page ) || $per_page < 1 ) {
         if ( 'plugins' == $screen )

trunk/wp-admin/plugins.php

@@ -355 +355 @@
 $total_this_page = "total_{$status}_plugins";
 $total_this_page = $$total_this_page;
-$plugins_per_page = (int) get_user_option( 'plugins_per_page', 0, false );
+$plugins_per_page = (int) get_user_option( 'plugins_per_page' );
 if ( empty( $plugins_per_page ) || $plugins_per_page < 1 )
     $plugins_per_page = 999;

trunk/wp-admin/upload.php

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

trunk/wp-includes/functions.php

@@ -771 +771 @@
         return;
 
-    $settings = get_user_option( 'user-settings', $user->ID, false );
+    $settings = get_user_option( 'user-settings', $user->ID );
 
     if ( isset( $_COOKIE['wp-settings-' . $user->ID] ) ) {
@@ -780 +780 @@
                 return;
 
-            $last_time = (int) get_user_option( 'user-settings-time', $user->ID, false );
+            $last_time = (int) get_user_option( 'user-settings-time', $user->ID );
             $saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0;
 

trunk/wp-includes/user.php

@@ -215 +215 @@
  * @param string $option User option name.
  * @param int $user Optional. User ID.
- * @param bool $check_blog_options Whether to check for an option in the options table if a per-user option does not exist. Default is true.
+ * @param bool $deprecated Use get_option() to check for an option in the options table.
  * @return mixed
  */
-function get_user_option( $option, $user = 0, $check_blog_options = true ) {
-    global $wpdb;
+function get_user_option( $option, $user = 0, $deprecated = '' ) {
+    global $wpdb;
+
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '3.0' );
 
     $option = preg_replace('|[^a-z0-9_]|i', '', $option);
@@ -231 +234 @@
     elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
         $result = $user->{$option};
-    elseif ( $check_blog_options ) // Blog global
-        $result = get_option( $option );
     else
         $result = false;