Changeset 9871 for trunk/wp-admin/includes/template.php

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

File:

• trunk/wp-admin/includes/template.php (modified) (6 diffs)

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 ) {