WordPress.org

Make WordPress Core

Changeset 14650


Ignore:
Timestamp:
05/15/2010 04:56:56 AM (8 years ago)
Author:
nacin
Message:

Remove default_comment_status_pages setting. Reverts [14451], [14448] for 3.0. see #12991.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/post.php

    r14643 r14650  
    386386        $post->to_ping = '';
    387387        $post->pinged = '';
    388         if ( 'page' == $post_type ) {
    389             $post->comment_status = get_option( 'default_comment_status_page' );
    390         } else {
    391             $post->comment_status = get_option( 'default_comment_status' );
    392         }
     388        $post->comment_status = get_option( 'default_comment_status' );
    393389        $post->ping_status = get_option( 'default_ping_status' );
    394390        $post->post_pingback = get_option( 'default_pingback_flag' );
  • trunk/wp-admin/includes/schema.php

    r14516 r14650  
    216216    'default_category' => 1,
    217217    'default_comment_status' => 'open',
    218     'default_comment_status_page' => 'open',
    219218    'default_ping_status' => 'open',
    220219    'default_pingback_flag' => 1,
  • trunk/wp-admin/options-discussion.php

    r14448 r14650  
    4343<br />
    4444<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
    45 <br />
    46 <label for="default_comment_status_page">
    47 <input name="default_comment_status_page" type="checkbox" id="default_comment_status_page" value="open" <?php checked('open', get_option('default_comment_status_page')); ?> />
    48 <?php _e('Allow people to post comments on new pages') ?></label>
    49 <br />
    50 <small><em><?php echo '(' . __('These settings may be overridden for individual pages.') . ')'; ?></em></small>
    5145</fieldset></td>
    5246</tr>
  • trunk/wp-admin/options.php

    r14448 r14650  
    5757$whitelist_options = array(
    5858    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
    59     'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status_page', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
     59    'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
    6060    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
    6161    'privacy' => array( 'blog_public' ),
  • trunk/wp-includes/post.php

    r14648 r14650  
    22532253            $comment_status = 'closed';
    22542254        else
    2255             if ( 'page' == $post_type ) {
    2256                 $comment_status = get_option( 'default_comment_status_page' );
    2257             } else {
    2258                 $comment_status = get_option( 'default_comment_status' );
    2259             }
     2255            $comment_status = get_option('default_comment_status');
    22602256    }
    22612257    if ( empty($ping_status) )
Note: See TracChangeset for help on using the changeset viewer.