golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Validation fixes from Viper007Bond. fixes #8026 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-11-01 05:03:05 +00:00
parent 5d6b4b4391
commit 5a7353c246
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/post.php
View File

@ -1221,6 +1221,7 @@ function wp_tiny_mce( $teeny = false ) {
$mce_options = rtrim( trim($mce_options), '\n\r,' ); ?>
<script type="text/javascript">
/* <![CDATA[ */
tinyMCEPreInit = {
base : "<?php echo $baseurl; ?>",
@ -1251,6 +1252,8 @@ tinyMCEPreInit = {
sl.markDone(url + '/langs/' + lang + '_dlg.js');
}
};
/* ]]> */
</script>
<script type="text/javascript" src="<?php echo $baseurl; ?>/tiny_mce.js?ver=<?php echo $ver; ?>"></script>
<?php if ( 'en' == $language ) { ?>

10
wp-admin/options-discussion.php
View File

@ -78,15 +78,15 @@ printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments
<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked('1', get_option('page_comments')); ?> />
<?php
$default_comments_page = '</label><select name="default_comments_page" id="default_comments_page"><option value="newest"';
$default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
$default_comments_page .= '>' . __('first') . '</option></select>';
printf( __('Break comments into pages with %1$s comments per page and the %2$s page displayed by default'), '</label><input name="comments_per_page" type="text" id="comments_per_page" value="' . attribute_escape(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
printf( __('Break comments into pages with %1$s comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="text" id="comments_per_page" value="' . attribute_escape(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
?>
?></label>
<br />
<label for="comment_order"><?php
@ -130,7 +130,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
<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 "press" will match "WordPress".') ?></label></p>
<p>
<textarea name="moderation_keys" rows="10" id="moderation_keys" class="large-text code"><?php form_option('moderation_keys'); ?></textarea>
<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php form_option('moderation_keys'); ?></textarea>
</p>
</fieldset></td>
</tr>
@ -139,7 +139,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
<td><fieldset><legend class="hidden"><?php _e('Comment Blacklist') ?></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 "press" will match "WordPress".') ?></label></p>
<p>
<textarea name="blacklist_keys" rows="10" id="blacklist_keys" class="large-text code"><?php form_option('blacklist_keys'); ?></textarea>
<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php form_option('blacklist_keys'); ?></textarea>
</p>
</fieldset></td>
</tr>