diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-admin/options-discussion.php | |
parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/options-discussion.php')
-rw-r--r-- | wp-admin/options-discussion.php | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 5791bc0..78deefd 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -7,78 +7,78 @@ $parent_file = 'options-general.php'; include('admin-header.php'); ?> -<div class="wrap"> -<h2><?php _e('Discussion Options') ?></h2> -<form method="post" action="options.php"> +<div class="wrap"> +<h2><?php _e('Discussion Options') ?></h2> +<form method="post" action="options.php"> <?php wp_nonce_field('update-options') ?> <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options »') ?>" /></p> <fieldset class="options"> -<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend> -<ul> -<li> -<label for="default_pingback_flag"> -<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> -<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> -</li> -<li> -<label for="default_ping_status"> -<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> -<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> -</li> -<li> -<label for="default_comment_status"> -<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> -<?php _e('Allow people to post comments on the article') ?></label> -</li> -</ul> +<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend> +<ul> +<li> +<label for="default_pingback_flag"> +<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> +<?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label> +</li> +<li> +<label for="default_ping_status"> +<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> +<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label> +</li> +<li> +<label for="default_comment_status"> +<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> +<?php _e('Allow people to post comments on the article') ?></label> +</li> +</ul> </fieldset> <fieldset class="options"> -<legend><?php _e('E-mail me whenever:') ?></legend> -<ul> -<li> -<label for="comments_notify"> -<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> /> -<?php _e('Anyone posts a comment') ?> </label> -</li> -<li> -<label for="moderation_notify"> -<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> /> -<?php _e('A comment is held for moderation') ?> </label> -</li> -</ul> +<legend><?php _e('E-mail me whenever:') ?></legend> +<ul> +<li> +<label for="comments_notify"> +<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> /> +<?php _e('Anyone posts a comment') ?> </label> +</li> +<li> +<label for="moderation_notify"> +<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> /> +<?php _e('A comment is held for moderation') ?> </label> +</li> +</ul> </fieldset> <fieldset class="options"> -<legend><?php _e('Before a comment appears:') ?></legend> +<legend><?php _e('Before a comment appears:') ?></legend> <ul> <li> -<label for="comment_moderation"> -<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> -<?php _e('An administrator must always approve the comment') ?> </label> -</li> -<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> -<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> -</ul> +<label for="comment_moderation"> +<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> +<?php _e('An administrator must always approve the comment') ?> </label> +</li> +<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> +<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> +</ul> </fieldset> <fieldset class="options"> <legend><?php _e('Comment Moderation') ?></legend> <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p> <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p> -<p> -<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> -</p> +<p> +<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> +</p> </fieldset> <fieldset class="options"> <legend><?php _e('Comment Blacklist') ?></legend> <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p> -<p> -<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> +<p> +<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> </p> </fieldset> <p class="submit"> -<input type="hidden" name="action" value="update" /> -<input type="hidden" name="page_options" value="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" /> -<input type="submit" name="Submit" value="<?php _e('Update Options »') ?>" /> +<input type="hidden" name="action" value="update" /> +<input type="hidden" name="page_options" value="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" /> +<input type="submit" name="Submit" value="<?php _e('Update Options »') ?>" /> </p> </form> </div> |