From ae484584028c752efb5faa4c02259556e853d26e Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 19 Sep 2006 16:06:15 +0000
Subject: WP Merge to 4197

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@761 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/admin-header.php                  |  3 ++
 wp-admin/options-discussion.php            | 28 +++++------------
 wp-admin/options-general.php               |  3 +-
 wp-admin/options-misc.php                  |  1 +
 wp-admin/options-permalink.php             |  5 +--
 wp-admin/options-reading.php               | 30 +++++++++---------
 wp-admin/options-writing.php               |  3 +-
 wp-admin/upgrade-schema.php                |  1 -
 wp-admin/users.php                         |  2 +-
 wp-admin/wp-admin.css                      | 18 +++++++----
 wp-content/themes/default/functions.php    |  2 +-
 wp-includes/classes.php                    |  2 +-
 wp-includes/comment.php                    |  4 ---
 wp-includes/default-filters.php            |  1 +
 wp-includes/functions.php                  | 12 --------
 wp-includes/js/scriptaculous/prototype.js  |  6 ++--
 wp-includes/js/tinymce/tiny_mce_config.php |  2 +-
 wp-includes/kses.php                       | 49 ++++++++++++++++++++++--------
 wp-includes/locale.php                     | 18 +++++++++++
 wp-includes/theme.php                      | 21 +++++++++++++
 wp-includes/wp-db.php                      |  2 +-
 21 files changed, 133 insertions(+), 80 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 2487f28..9a9eec0 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -18,6 +18,9 @@ get_admin_page_title();
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
 <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php endif; ?> 
 <script type="text/javascript">
 //<![CDATA[
 function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index e7317ce..0692f96 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -5,23 +5,13 @@ $title = __('Discussion Options');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
-
-if ($action == 'retrospam') {
-	if ( $_GET['move'] == 'true' ) {
-		retrospam_mgr::move_spam( $_GET[ids] );
-	}
-	$retrospaminator = new retrospam_mgr();
-	$result = $retrospaminator->find_spam();
-	echo $retrospaminator->display_edit_form( $result );
-	include('./admin-footer.php');
-	exit;
-}
 ?>
 
 <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 &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend> 
 <ul> 
@@ -63,7 +53,7 @@ if ($action == 'retrospam') {
 <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 approve the comment (regardless of any matches below)') ?> </label> 
+<?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> 
@@ -73,17 +63,14 @@ if ($action == 'retrospam') {
 <legend><?php _e('Comment Moderation') ?></legend>
 <p><?php printf(__('Hold a comment in the queue if it contains more than %s 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, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></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>
-<a id="retrospambutton" href="options-discussion.php?action=retrospam"><?php _e('Check past comments against moderation list'); ?></a>
-</p> 
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Blacklist') ?></legend>
-<p><?php _e('This is a list of words that you want completely blacklisted from your blog. Be very careful what you add here, because if a comment matches something here it will be completely nuked and there will be no notification. Remember that partial words can match, so if there is any chance something here might match it would be better to put it in the moderation box above.') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be deleted. 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>
@@ -91,8 +78,9 @@ if ($action == 'retrospam') {
 <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') ?>" /> 
-</p> 
-</form> 
+<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
+</p>
+</form>
 </div>
+
 <?php include('./admin-footer.php'); ?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 579a95b..1e6ebef 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -11,6 +11,7 @@ include('./admin-header.php');
 <h2><?php _e('General 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 &raquo;') ?>" /></p>
 <table class="optiontable"> 
 <tr valign="top"> 
 <th scope="row"><?php _e('Weblog title:') ?></th> 
@@ -81,7 +82,7 @@ if( is_array( $lang_files ) && count($lang_files) > 1 ) {
 <tr>
 <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
 <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" /> 
-<?php _e('hours') ?> </td>
+<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Default date format:') ?></th>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 1989f33..dba00f2 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -13,6 +13,7 @@ include('admin-header.php');
 <h2><?php _e('Miscellaneous 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 &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
 <table class="editform optiontable">
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index e6fd7d4..a5d17f1 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -108,6 +108,9 @@ else
 
 <div class="wrap"> 
   <h2><?php _e('Customize Permalink Structure') ?></h2> 
+<form name="form" action="options-permalink.php" method="post"> 
+<?php wp_nonce_field('update-permalink') ?>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /></p>
   <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
@@ -122,8 +125,6 @@ $structures = array(
 	$prefix . '/archives/%post_id%'
 	);
 ?>
-<form name="form" action="options-permalink.php" method="post"> 
-<?php wp_nonce_field('update-permalink') ?>
 <h3><?php _e('Common options:'); ?></h3>
 <p>
 	<label>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 232c90a..bb7bd9e 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -11,26 +11,27 @@ include('admin-header.php');
 <h2><?php _e('Reading Options') ?></h2> 
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <?php if ( get_pages() ): ?>
 <fieldset class="options"> 
 <legend><?php _e('Front Page') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Front page displays:')?></th> 
 <td>
-	<label>
+	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> /> 
-		<?php _e('The latest posts'); ?>
+		<?php _e('Your latest posts'); ?>
 	</label>
-	<br />
-	<label>
+	</p>
+	<p><label>
 		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> /> 
-		<?php printf(__('A static <a href="%s">page</a> (select below)'), 'edit-pages.php'); ?>
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit-pages.php'); ?>
 	</label>
+	</p>
 <ul>
-	<li><?php printf(__('Show this page on the front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
-	<li><?php printf(__('Show the latest posts on this page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
+	<li><?php printf(__('Front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
+	<li><?php printf(__('Posts page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
 </ul>
 <?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
 <div id="front-page-warning" class="updated fade-ff0000">
@@ -48,7 +49,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Blog Pages') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
 <td>
@@ -64,7 +65,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Syndication Feeds') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td> 
@@ -72,13 +73,14 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><?php _e('For each article, show:') ?> </th>
 <td>
-<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
+<p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
+<p><?php _e('Note: If you use the <code>&lt;--more--&gt;</code> feature, it will cut off posts in RSS feeds.'); ?></p>
 </td>
 </tr> 
 </table> 
 </fieldset> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th> 
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 4cd82ae..acb6dff 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -11,7 +11,8 @@ include('admin-header.php');
 <h2><?php _e('Writing Options') ?></h2> 
 <form method="post" action="options.php"> 
 <?php wp_nonce_field('update-options') ?>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th> 
 <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " /> 
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index 3eae7e0..20d170d 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -283,7 +283,6 @@ function populate_options() {
 	add_option('page_uris');
 	add_option('blacklist_keys');
 	add_option('comment_registration', 0);
-	add_option('open_proxy_check', 0);
 	add_option('rss_language', 'en');
 	add_option('html_type', 'text/html');
 	// 1.5.1
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 2be5ed1..f8e7578 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -532,7 +532,7 @@ foreach ( (array) $roleclass as $user_object ) {
 	<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-	<h2><?php _e('Update Users'); ?></h2>
+	<h3><?php _e('Update Selected'); ?></h3>
 	<ul style="list-style:none;">
 		<li><input type="radio" name="action" id="action0" value="removeuser" /> <label for="action0"><?php _e('Remove checked users.'); ?></label></li>
 		<li>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 1ea420a..b7efc50 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -118,7 +118,9 @@ fieldset.options {
 }
 
 fieldset.options legend {
-	font-size: 16px;
+	font-size: 1.5em;
+	font-weight: bold;
+	font-family: Georgia, "Times New Roman", Times, serif;
 }
 
 form, label input {
@@ -331,6 +333,8 @@ form#upload #post_content {
 .optiontable th {
 	width: 33%;
 	text-align: right;
+	font-size: 1.3em;
+	font-weight: normal;
 }
 
 .unapproved {
@@ -393,14 +397,15 @@ table .vers {
 }
 
 #adminmenu {
-	background: #6da6d1;
+	background: #83B4D8;
 	border-top: 3px solid #448abd;
 	margin: 0;
-	padding: .2em .2em .2em 2em;
+	padding: .2em .2em .3em 2em;
 }
 
 #adminmenu .current, #submenu .current {
 	font-weight: bold;
+	text-decoration: none;
 }
 
 #adminmenu a {
@@ -409,10 +414,11 @@ table .vers {
 	font-weight: normal;
 	margin: 0;
 	padding: 3px 5px;
-	text-decoration: none;
+	text-decoration: underline;
+	border-bottom: none;
 }
 
-#adminmenu a:hover, .current {
+#adminmenu a:hover, #adminmenu a.current {
 	background: #ddeaf4;
 	color: #333;
 }
@@ -916,7 +922,7 @@ table .vers {
 	border: 1px solid #ccc;
 	float: left;
 	width: 40%;
-	padding: .5em 2em;
+	padding: .5em 2em 1em;
 	margin: 1em 1em 1em 0; 
 }
 
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index a6b09ef..5a6400e 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -373,13 +373,13 @@ function kubrick_theme_page() {
 				<input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="Lower Color"></input>
 				<input type="button" name="revert" value="Revert" onclick="kRevert()" />
 				<input type="button" value="Advanced" onclick="toggleAdvanced()" />
-				<input type="submit" name="submitform" class="defbutton" value="Save" onclick="cp.hidePopup('prettyplease')" />
 				<input type="hidden" name="action" value="save" />
 				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />
 				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" />
 				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" />
 				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />
 				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />
+				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
 			</form>
 			<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
 			<div id="advanced">
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 5437ed9..55b46a3 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -111,7 +111,7 @@ class WP {
 
 			$pathinfo = $_SERVER['PATH_INFO'];
 			$pathinfo_array = explode('?', $pathinfo);
-			$pathinfo = $pathinfo_array[0];
+			$pathinfo = str_replace("%", "%25", $pathinfo_array[0]);
 			$req_uri = $_SERVER['REQUEST_URI'];
 			$req_uri_array = explode('?', $req_uri);
 			$req_uri = $req_uri_array[0];
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 45fe0f8..3189b14 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -257,10 +257,6 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
 		if ( preg_match($pattern, $user_agent) ) return true;
 	}
 
-	if ( isset($_SERVER['REMOTE_ADDR']) ) {
-		if ( wp_proxy_check($_SERVER['REMOTE_ADDR']) ) return true;
-	}
-
 	return false;
 }
 
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 61afd0a..22b5528 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -144,6 +144,7 @@ add_filter('option_blog_charset', 'wp_specialchars');
 
 // Actions
 add_action('wp_head', 'rsd_link');
+add_action('wp_head', 'locale_stylesheet');
 add_action('publish_future_post', 'wp_publish_post', 10, 1);
 add_action('wp_head', 'noindex', 1);
 add_action('wp_head', 'wp_print_scripts');
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 230bf96..1401b7b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1034,18 +1034,6 @@ function wp_check_filetype($filename, $mimes = null) {
 	return compact('ext', 'type');
 }
 
-function wp_proxy_check($ipnum) {
-	if ( get_option('open_proxy_check') && isset($ipnum) ) {
-		$ipnum = preg_replace( '/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/', '$1', $ipnum );
-		$rev_ip = implode( '.', array_reverse( explode( '.', $ipnum ) ) );
-		$lookup = $rev_ip . '.sbl-xbl.spamhaus.org.';
-		if ( $lookup != gethostbyname( $lookup ) )
-			return true;
-	}
-
-	return false;
-}
-
 function wp_explain_nonce($action) {
 	if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {
 		$verb = $matches[1];
diff --git a/wp-includes/js/scriptaculous/prototype.js b/wp-includes/js/scriptaculous/prototype.js
index 0caf9cd..76846d2 100644
--- a/wp-includes/js/scriptaculous/prototype.js
+++ b/wp-includes/js/scriptaculous/prototype.js
@@ -1765,7 +1765,9 @@ Object.extend(Event, {
     if (element.removeEventListener) {
       element.removeEventListener(name, observer, useCapture);
     } else if (element.detachEvent) {
-      element.detachEvent('on' + name, observer);
+      try {
+        element.detachEvent('on' + name, observer);
+      } catch (e) {}
     }
   }
 });
@@ -2003,4 +2005,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
 
     return [valueL, valueT];
   }
-}
\ No newline at end of file
+}
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index 283ffb8..dad3aff 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -21,7 +21,7 @@
 	}
 
 	// Set up init variables
-	$valid_elements = 'p/-div[*],-b[*],-font[*],-ul[*],-ol[*],-li[*],*[*]';
+	$valid_elements = 'p/-div[*],-strong/-b[*],-em/-i[*],-font[*],-ul[*],-ol[*],-li[*],*[*]';
 	$valid_elements = apply_filters('mce_valid_elements', $valid_elements);
 
 	$plugins = array('inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress');
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 3f244bc..e3a0bcd 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -23,6 +23,7 @@ if (!CUSTOM_TAGS) {
 		'a' => array (
 			'class' => array (),
 			'href' => array (),
+			'id' => array (),
 			'title' => array (),
 			'rel' => array (),
 			'rev' => array (),
@@ -35,16 +36,20 @@ if (!CUSTOM_TAGS) {
 		'b' => array (),
 		'big' => array (), 
 		'blockquote' => array (
+			'id' => array (),
 			'cite' => array ()),
-		'br' => array (),
+		'br' => array (
+			'class' => array ()),
 		'button' => array (
 			'disabled' => array (),
 			'name' => array (),
 			'type' => array (),
 			'value' => array ()),
 		'caption' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'cite' => array (
+			'class' => array(),
 			'dir' => array(),
 			'lang' => array(),
 			'title' => array ()),
@@ -63,7 +68,7 @@ if (!CUSTOM_TAGS) {
 		'div' => array (
 			'align' => array (),
 			'class' => array (),
-			'dir' => array ()),
+			'dir' => array (),
 		'dl' => array (),
 		'dt' => array (),
 		'em' => array (),
@@ -81,19 +86,26 @@ if (!CUSTOM_TAGS) {
 			'name' => array (),
 			'target' => array ()),
 		'h1' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'h2' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'h3' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'h4' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'h5' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'h6' => array (
-			'align' => array ()),
+			'align' => array (),
+			'class' => array ()),
 		'hr' => array (
 			'align' => array (),
+			'class' => array (),
 			'noshade' => array (),
 			'size' => array (),
 			'width' => array ()),
@@ -114,6 +126,7 @@ if (!CUSTOM_TAGS) {
 			'alt' => array (),
 			'align' => array (),
 			'border' => array (),
+			'class' => array (),
 			'height' => array (),
 			'hspace' => array (),
 			'longdesc' => array (),
@@ -134,12 +147,16 @@ if (!CUSTOM_TAGS) {
 		'p' => array (
 			'class' => array (),
 			'align' => array (),
-			'dir' => array()),
+			'dir' => array(),
 		'pre' => array (
 			'width' => array ()),
 		'q' => array (
 			'cite' => array ()),
 		's' => array (),
+		'span' => array (
+			'class' => array (),
+			'dir' => array (),
+			'align' => array (),
 		'strike' => array (),
 		'strong' => array (),
 		'sub' => array (),
@@ -150,6 +167,7 @@ if (!CUSTOM_TAGS) {
 			'border' => array (),
 			'cellpadding' => array (),
 			'cellspacing' => array (),
+			'class' => array (),
 			'dir' => array(),
 			'rules' => array (),
 			'summary' => array (),
@@ -166,6 +184,7 @@ if (!CUSTOM_TAGS) {
 			'bgcolor' => array (),
 			'char' => array (),
 			'charoff' => array (),
+			'class' => array (),
 			'colspan' => array (),
 			'dir' => array(),
 			'headers' => array (),
@@ -184,6 +203,7 @@ if (!CUSTOM_TAGS) {
 		'tfoot' => array (
 			'align' => array (),
 			'char' => array (),
+			'class' => array (),
 			'charoff' => array (),
 			'valign' => array ()),
 		'th' => array (
@@ -193,6 +213,7 @@ if (!CUSTOM_TAGS) {
 			'bgcolor' => array (),
 			'char' => array (),
 			'charoff' => array (),
+			'class' => array (),
 			'colspan' => array (),
 			'headers' => array (),
 			'height' => array (),
@@ -205,6 +226,7 @@ if (!CUSTOM_TAGS) {
 			'align' => array (),
 			'char' => array (),
 			'charoff' => array (),
+			'class' => array (),
 			'valign' => array ()),
 		'title' => array (),
 		'tr' => array (
@@ -212,11 +234,14 @@ if (!CUSTOM_TAGS) {
 			'bgcolor' => array (),
 			'char' => array (),
 			'charoff' => array (),
+			'class' => array (),
 			'valign' => array ()),
 		'tt' => array (),
 		'u' => array (),
-		'ul' => array (),
-		'ol' => array (),
+		'ul' => array (
+			'class' => array ()),
+		'ol' => array (
+			'class' => array ()),
 		'var' => array ());
 	$allowedtags = array (
 		'a' => array (
diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 9fc37a4..4b6c654 100644
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -12,6 +12,9 @@ class WP_Locale {
 
 	var $meridiem;
 
+	var $text_direction = '';
+	var $locale_vars = array('text_direction');
+
 	function init() {
 		// The Weekdays
 		$this->weekday[0] = __('Sunday');
@@ -83,6 +86,21 @@ class WP_Locale {
 		$this->meridiem['pm'] = __('pm');
 		$this->meridiem['AM'] = __('AM');
 		$this->meridiem['PM'] = __('PM');
+
+		$this->_load_locale_data();
+	}
+
+	function _load_locale_data() {
+		$locale = get_locale();
+		$locale_file = ABSPATH . "wp-includes/languages/$locale.php";
+		if ( !file_exists($locale_file) )
+			return;
+
+		include($locale_file);
+
+		foreach ( $this->locale_vars as $var ) {
+			$this->$var = $$var;	
+		}
 	}
 
 	function get_weekday($weekday_number) {
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 36f001d..d8051da 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -25,6 +25,20 @@ function get_stylesheet_uri() {
 	return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
+function get_locale_stylesheet_uri() {
+	global $wp_locale;
+	$stylesheet_dir_uri = get_stylesheet_directory_uri();
+	$dir = get_stylesheet_directory();
+	$locale = get_locale();
+	if ( file_exists("$dir/$locale.css") )
+		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
+	else if ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
+	else
+		$stylesheet_uri = '';
+	return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
+}
+
 function get_template() {
 	return apply_filters('template', get_option('template'));
 }
@@ -370,6 +384,13 @@ function load_template($file) {
 	require_once($file);
 }
 
+function locale_stylesheet() {
+	$stylesheet = get_locale_stylesheet_uri();
+	if ( empty($stylesheet) )
+		return;
+	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+}
+
 function validate_current_theme() {
 	// Don't validate during an install/upgrade.
 	if ( defined('WP_INSTALLING') )
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index c80e5fc..d02606b 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -378,7 +378,7 @@ class wpdb {
 		if ( !$this->show_errors )
 			return false;
 
-		header( 'Content-Type: text/html; charset=utf-8');
+		header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-- 
cgit