Changeset 14650

Timestamp:

05/15/2010 04:56:56 AM (15 years ago)

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-discussion.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -386 +386 @@
         $post->to_ping = '';
         $post->pinged = '';
-        if ( 'page' == $post_type ) {
-            $post->comment_status = get_option( 'default_comment_status_page' );
-        } else {
-            $post->comment_status = get_option( 'default_comment_status' );
-        }
+        $post->comment_status = get_option( 'default_comment_status' );
         $post->ping_status = get_option( 'default_ping_status' );
         $post->post_pingback = get_option( 'default_pingback_flag' );

trunk/wp-admin/includes/schema.php

@@ -216 +216 @@
     'default_category' => 1,
     'default_comment_status' => 'open',
-    'default_comment_status_page' => 'open',
     'default_ping_status' => 'open',
     'default_pingback_flag' => 1,

trunk/wp-admin/options-discussion.php

@@ -43 +43 @@
 <br />
 <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
-<br />
-<label for="default_comment_status_page">
-<input name="default_comment_status_page" type="checkbox" id="default_comment_status_page" value="open" <?php checked('open', get_option('default_comment_status_page')); ?> />
-<?php _e('Allow people to post comments on new pages') ?></label>
-<br />
-<small><em><?php echo '(' . __('These settings may be overridden for individual pages.') . ')'; ?></em></small>
 </fieldset></td>
 </tr>

trunk/wp-admin/options.php

@@ -57 +57 @@
 $whitelist_options = array(
     'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
-    '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' ),
+    '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' ),
     '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' ),
     'privacy' => array( 'blog_public' ),

trunk/wp-includes/post.php

@@ -2253 +2253 @@
             $comment_status = 'closed';
         else
-            if ( 'page' == $post_type ) {
-                $comment_status = get_option( 'default_comment_status_page' );
-            } else {
-                $comment_status = get_option( 'default_comment_status' );
-            }
+            $comment_status = get_option('default_comment_status');
     }
     if ( empty($ping_status) )