<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18508] trunk/wp-admin/options-discussion.php: Remove gratuitous periods.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18508">18508</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-08-04 16:07:51 +0000 (Thu, 04 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove gratuitous periods. Add some semicolons. Props SergeyBiryukov. fixes <a href="http://core.trac.wordpress.org/ticket/16186">#16186</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (18507 => 18508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2011-08-04 16:03:53 UTC (rev 18507)
+++ trunk/wp-admin/options-discussion.php 2011-08-04 16:07:51 UTC (rev 18508)
</span><span class="lines">@@ -35,38 +35,38 @@
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Default article settings') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('Default article settings'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings'); ?></span></legend>
</ins><span class="cx"> <label for="default_pingback_flag">
</span><span class="cx"> <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
</span><del>-<?php _e('Attempt to notify any blogs linked to from the article.') ?></label>
</del><ins>+<?php _e('Attempt to notify any blogs linked to from the article'); ?></label>
</ins><span class="cx"> <br />
</span><span class="cx"> <label for="default_ping_status">
</span><span class="cx"> <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
</span><del>-<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label>
</del><ins>+<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks)'); ?></label>
</ins><span class="cx"> <br />
</span><span class="cx"> <label for="default_comment_status">
</span><span class="cx"> <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
</span><del>-<?php _e('Allow people to post comments on new articles') ?></label>
</del><ins>+<?php _e('Allow people to post comments on new articles'); ?></label>
</ins><span class="cx"> <br />
</span><span class="cx"> <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Other comment settings') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings') ?></span></legend>
-<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>
</del><ins>+<th scope="row"><?php _e('Other comment settings'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
+<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>
</ins><span class="cx"> <br />
</span><span class="cx"> <label for="comment_registration">
</span><span class="cx"> <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
</span><del>-<?php _e('Users must be registered and logged in to comment') ?>
</del><ins>+<?php _e('Users must be registered and logged in to comment'); ?>
</ins><span class="cx"> <?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
</span><span class="cx"> </label>
</span><span class="cx"> <br />
</span><span class="cx">
</span><span class="cx"> <label for="close_comments_for_old_posts">
</span><span class="cx"> <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
</span><del>-<?php printf( __('Automatically close comments on articles older than %s days'), '</label><input name="close_comments_days_old" type="text" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />') ?>
</del><ins>+<?php printf( __('Automatically close comments on articles older than %s days'), '</label><input name="close_comments_days_old" type="text" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />'); ?>
</ins><span class="cx"> <br />
</span><span class="cx"> <label for="thread_comments">
</span><span class="cx"> <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />
</span><span class="lines">@@ -113,42 +113,42 @@
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('E-mail me whenever') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('E-mail me whenever'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
</ins><span class="cx"> <label for="comments_notify">
</span><span class="cx"> <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
</span><del>-<?php _e('Anyone posts a comment') ?> </label>
</del><ins>+<?php _e('Anyone posts a comment'); ?> </label>
</ins><span class="cx"> <br />
</span><span class="cx"> <label for="moderation_notify">
</span><span class="cx"> <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
</span><del>-<?php _e('A comment is held for moderation') ?> </label>
</del><ins>+<?php _e('A comment is held for moderation'); ?> </label>
</ins><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Before a comment appears') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('Before a comment appears'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
</ins><span class="cx"> <label for="comment_moderation">
</span><span class="cx"> <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
</span><del>-<?php _e('An administrator must always approve the comment') ?> </label>
</del><ins>+<?php _e('An administrator must always approve the comment'); ?> </label>
</ins><span class="cx"> <br />
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Comment Moderation') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation') ?></span></legend>
-<p><label for="comment_max_links"><?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" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ) ?></label></p>
</del><ins>+<th scope="row"><?php _e('Comment Moderation'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
+<p><label for="comment_max_links"><?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" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
</ins><span class="cx">
</span><del>-<p><label for="moderation_keys"><?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="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.') ?></label></p>
</del><ins>+<p><label for="moderation_keys"><?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="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
</ins><span class="cx"> <p>
</span><span class="cx"> <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
</span><span class="cx"> </p>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Comment Blacklist') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist') ?></span></legend>
-<p><label for="blacklist_keys"><?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 &#8220;press&#8221; will match &#8220;WordPress&#8221;.') ?></label></p>
</del><ins>+<th scope="row"><?php _e('Comment Blacklist'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
+<p><label for="blacklist_keys"><?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 &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
</ins><span class="cx"> <p>
</span><span class="cx"> <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
</span><span class="cx"> </p>
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> <?php do_settings_fields('discussion', 'default'); ?>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<h3><?php _e('Avatars') ?></h3>
</del><ins>+<h3><?php _e('Avatars'); ?></h3>
</ins><span class="cx">
</span><span class="cx"> <p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
</span><span class="cx">
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Avatar Display') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('Avatar Display'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
</ins><span class="cx"> <?php
</span><span class="cx"> $yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
</span><span class="cx"> foreach ( $yesorno as $key => $value) {
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Maximum Rating') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('Maximum Rating'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $ratings = array(
</span><span class="lines">@@ -200,8 +200,8 @@
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Default Avatar') ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar') ?></span></legend>
</del><ins>+<th scope="row"><?php _e('Default Avatar'); ?></th>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
</ins><span class="cx">
</span><span class="cx"> <?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>