Changeset 11318

Timestamp:

05/13/2009 10:28:56 PM (15 years ago)

Author:

ryan

Message:

Remove vestiges of what_to_show. Props filosofo. fixes #9815

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-app.php (modified) (1 diff)
• wp-includes/classes.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -46 +46 @@
 
 $posts_per_page = get_option('posts_per_page');
-$what_to_show = get_option('what_to_show');
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');

trunk/wp-admin/edit-pages.php

@@ -83 +83 @@
     );
 
-$query = array('post_type' => 'page', 'orderby' => 'menu_order title', 'what_to_show' => 'posts',
+$query = array('post_type' => 'page', 'orderby' => 'menu_order title',
     'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc');
 

trunk/wp-admin/includes/dashboard.php

@@ -368 +368 @@
             $drafts_query = new WP_Query( array(
                 'post_type' => 'post',
-                'what_to_show' => 'posts',
                 'post_status' => 'draft',
                 'author' => $GLOBALS['current_user']->ID,
@@ -435 +434 @@
         $drafts_query = new WP_Query( array(
             'post_type' => 'post',
-            'what_to_show' => 'posts',
             'post_status' => 'draft',
             'author' => $GLOBALS['current_user']->ID,

trunk/wp-admin/includes/post.php

@@ -824 +824 @@
     $posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page);
 
-    wp("post_type=post&what_to_show=posts$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby");
+    wp("post_type=post&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby");
 
     return array($post_stati, $avail_post_stati);

trunk/wp-admin/includes/schema.php

@@ -213 +213 @@
     'default_post_edit_rows' => 10,
     'posts_per_page' => 10,
-    'what_to_show' => 'posts',
     /* translators: default date format, see http://php.net/date */
     'date_format' => __('F j, Y'),

trunk/wp-admin/includes/upgrade.php

@@ -527 +527 @@
         }
     }
-
-    // The "paged" option for what_to_show is no more.
-    if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged')
-        $wpdb->update( $wpdb->options, array('option_value' => 'posts'), array('option_name' => 'what_to_show') );
 
     $active_plugins = __get_option('active_plugins');

trunk/wp-app.php

@@ -1089 +1089 @@
         $count = get_option('posts_per_rss');
 
-        wp('what_to_show=posts&posts_per_page=' . $count . '&offset=' . ($count * ($page-1) . '&orderby=modified'));
+        wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1) . '&orderby=modified'));
 
         $post = $GLOBALS['post'];

trunk/wp-includes/classes.php

@@ -37 +37 @@
      * @var array
      */
-    var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page');
+    var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page');
 
     /**

trunk/wp-includes/default-widgets.php

@@ -556 +556 @@
             $number = 15;
 
-        $r = new WP_Query(array('showposts' => $number, 'what_to_show' => 'posts', 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
+        $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
         if ($r->have_posts()) :
 ?>