Changeset 9871

Timestamp:

11/25/2008 06:33:04 PM (16 years ago)

Author:

ryan

Message:

Add option defaults. Add arg to get_user_option() to avoid querying options table if user option is missing. see #8229

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (6 diffs)
• wp-admin/link-manager.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/edit-attachment-rows.php

@@ -36 +36 @@
 
 <?php
-$posts_columns = wp_manage_media_columns();
-$hidden = (array) get_user_option( 'manage-media-columns-hidden' );
+$posts_columns = get_column_headers('media');
+$hidden = get_hidden_columns('media');
 
 foreach ($posts_columns as $column_name => $column_display_name ) {

trunk/wp-admin/edit-form-advanced.php

@@ -436 +436 @@
 <p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p>
 <?php
-    $hidden = (array) get_user_option( "meta-box-hidden_post" );
+    $hidden = (array) get_user_option( "meta-box-hidden_post", 0, false );
     if ( ! in_array('commentstatusdiv', $hidden) ) { ?>
         <script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script>

trunk/wp-admin/includes/post.php

@@ -870 +870 @@
         return '';
     $current_user = wp_get_current_user();
-    if ( $closed = get_usermeta( $current_user->ID, 'closedpostboxes_'.$page ) ) {
+    if ( $closed = get_user_option('closedpostboxes_'.$page, 0, false ) ) {
         if ( !is_array( $closed ) ) return '';
         return in_array( $id, $closed )? 'if-js-closed' : '';

trunk/wp-admin/includes/schema.php

@@ -295 +295 @@
     add_option('default_comments_page', 'newest');
     add_option('comment_order', 'asc');
-
+    add_option('use_ssl', 0);
+    add_option('sticky_posts', array());
+    add_option('widget_categories', array());
+    add_option('widget_text', array());
+    add_option('widget_rss', array());
+    add_option('update_core', array());
+    add_option('dismissed_update_core', array());
+    
     // Delete unused options
     $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');

trunk/wp-admin/includes/template.php

@@ -204 +204 @@
     $is_tag = $type == 'tag';
     $columns = $is_tag ? get_column_headers('tag') : get_column_headers('category');
-    $hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) );
+    $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
     $col_count = count($columns) - count($hidden);
     ?>
@@ -901 +901 @@
 function get_hidden_columns($page) {
     $page = str_replace('.php', '', $page);
-    return (array) get_user_option( 'manage-' . $page . '-columns-hidden' );    
+    return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false );  
 }
 
@@ -923 +923 @@
 
     $columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
-    $hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) );
+    $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
     $col_count = count($columns) - count($hidden);
     $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
@@ -2698 +2698 @@
     //do_action('do_meta_boxes', $page, $context, $object);
 
-    $hidden = (array) get_user_option( "meta-box-hidden_$page" );
+    $hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false );
 
     echo "<div id='$context-sortables' class='meta-box-sortables'>\n";
@@ -2705 +2705 @@
     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" ) ) {
+        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page", 0, false ) ) {
             foreach ( $sorted as $box_context => $ids )
                 foreach ( explode(',', $ids) as $id )
@@ -2778 +2778 @@
         return;
 
-    $hidden = (array) get_user_option( "meta-box-hidden_$page" );
+    $hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false );
 
     foreach ( array_keys($wp_meta_boxes[$page]) as $context ) {

trunk/wp-admin/link-manager.php

@@ -139 +139 @@
 if ( $links ) {
     $link_columns = get_column_headers('link-manager');
-    $hidden = (array) get_user_option( 'manage-link-manager-columns-hidden' );
+    $hidden = get_hidden_columns('link-manager');
 ?>
 

trunk/wp-includes/user.php

@@ -169 +169 @@
  * @param string $option User option name.
  * @param int $user Optional. User ID.
+ * @param bool $check_global Whether to check for a global option if a per-user option does not exist. Default is true.
  * @return mixed
  */
-function get_user_option( $option, $user = 0 ) {
+function get_user_option( $option, $user = 0, $check_global = true ) {
     global $wpdb;
 
@@ -184 +185 @@
     elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
         $result = $user->{$option};
-    else // Blog global
+    elseif ( $check_global ) // Blog global
         $result = get_option( $option );
+    else
+        $result = false;
 
     return apply_filters("get_user_option_{$option}", $result, $option, $user);

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 9621;
+$wp_db_version = 9872;
 
 ?>