Don't do bad xhtml fixing by default - fixes #1975

git-svn-id: http://svn.automattic.com/wordpress/trunk@3223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-11-28 23:05:12 +00:00
parent 6b4867e248
commit beff0bedba
4 changed files with 6 additions and 6 deletions

View File

@ -24,7 +24,8 @@ include('admin-header.php');
<?php _e('Users should use the visual rich editor by default') ?></label><br /> <?php _e('Users should use the visual rich editor by default') ?></label><br />
<label for="use_smilies"> <label for="use_smilies">
<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> /> <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
<?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label> <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
<label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -89,7 +90,7 @@ endforeach;
<p class="submit"> <p class="submit">
<input type="hidden" name="action" value="update" /> <input type="hidden" name="action" value="update" />
<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category" /> <input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags" />
<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" /> <input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
</p> </p>
</form> </form>

View File

@ -17,7 +17,7 @@ $bookmarklet_height= 440;
<?php } ?> <?php } ?>
<div class="wrap"> <div class="wrap">
<h2><?php _e('Your Profile'); ?></h2> <h2><?php _e('Your Profile and Personal Options'); ?></h2>
<form name="profile" id="your-profile" action="profile-update.php" method="post"> <form name="profile" id="your-profile" action="profile-update.php" method="post">
<p> <p>
<input type="hidden" name="from" value="profile" /> <input type="hidden" name="from" value="profile" />

View File

@ -161,7 +161,7 @@ function populate_options() {
add_option('users_can_register', 0); add_option('users_can_register', 0);
add_option('admin_email', 'you@example.com'); add_option('admin_email', 'you@example.com');
add_option('start_of_week', 1); add_option('start_of_week', 1);
add_option('use_balanceTags', 1); add_option('use_balanceTags', 0);
add_option('use_smilies', 1); add_option('use_smilies', 1);
add_option('require_name_email', 1); add_option('require_name_email', 1);
add_option('comments_notify', 1); add_option('comments_notify', 1);

View File

@ -392,9 +392,8 @@ function funky_javascript_fix($text) {
*/ */
function balanceTags($text, $is_comment = 0) { function balanceTags($text, $is_comment = 0) {
if (get_settings('use_balanceTags') == 0) { if ( get_option('use_balanceTags') == 0)
return $text; return $text;
}
$tagstack = array(); $stacksize = 0; $tagqueue = ''; $newtext = ''; $tagstack = array(); $stacksize = 0; $tagqueue = ''; $newtext = '';