WP Merge to 4524

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36

62 files changed, 1875 insertions, 1633 deletions

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 4e27900..cc93b16 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -128,7 +128,7 @@ case 'add-category' : // On the Fly
 	break;
 case 'add-cat' : // From Manage->Categories
 	if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
+		die('-1');
 	if ( !$cat = wp_insert_category( $_POST ) )
 		die('0');
 	if ( !$cat = get_category( $cat ) )
diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php
index b41891f..ea6e60d 100644
--- a/wp-admin/admin-db.php
+++ b/wp-admin/admin-db.php
@@ -48,7 +48,7 @@ function get_editable_user_ids( $user_id, $exclude_zeros = true ) {
 	if ( ! $user->has_cap('edit_others_posts') ) {
 		if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
 			return array($user->id);
-		else 
+		else
 			return false;
 	}
 
@@ -157,6 +157,9 @@ function wp_update_category($catarr) {
 
 	$cat_ID = (int) $catarr['cat_ID'];
 
+	if( $cat_ID == $catarr['category_parent'] )
+		return false;
+
 	// First, get all of the original fields
 	$category = get_category($cat_ID, ARRAY_A);
 
@@ -201,7 +204,7 @@ function wp_delete_category($cat_ID) {
 			$cats = array($default_cat);
 		else
 			$cats = array_diff($cats, array($cat_ID));
-		wp_set_post_categories($post_id, $cats); 
+		wp_set_post_categories($post_id, $cats);
 	}
 
 	$default_link_cat = get_option('default_link_category');
@@ -212,9 +215,9 @@ function wp_delete_category($cat_ID) {
 			$cats = array($default_link_cat);
 		else
 			$cats = array_diff($cats, array($cat_ID));
-		wp_set_link_cats($link_id, $cats); 
+		wp_set_link_cats($link_id, $cats);
 	}
-	
+
 	wp_cache_delete($cat_ID, 'category');
 	wp_cache_delete('all_category_ids', 'category');
 
@@ -287,9 +290,9 @@ function wp_delete_user($id, $reassign = 'novalue') {
 
 function wp_revoke_user($id) {
 	$id = (int) $id;
-	
+
 	$user = new WP_User($id);
-	$user->remove_all_caps();	
+	$user->remove_all_caps();
 }
 
 function wp_insert_link($linkdata) {
@@ -387,15 +390,15 @@ function wp_update_link($linkdata) {
 	$link = add_magic_quotes($link);
 
 	// Passed link category list overwrites existing category list if not empty.
- 	if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+	if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
 			 && 0 != count($linkdata['link_category']) )
- 		$link_cats = $linkdata['link_category'];
- 	else 
- 		$link_cats = $link['link_category'];
+		$link_cats = $linkdata['link_category'];
+	else
+		$link_cats = $link['link_category'];
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$linkdata = array_merge($link, $linkdata);
- 	$linkdata['link_category'] = $link_cats;
+	$linkdata['link_category'] = $link_cats;
 
 	return wp_insert_link($linkdata);
 }
@@ -404,7 +407,7 @@ function wp_delete_link($link_id) {
 	global $wpdb;
 
 	do_action('delete_link', $link_id);
-	
+
 	$categories = wp_get_link_cats($link_id);
 	if( is_array( $categories ) ) {
 		foreach ( $categories as $category ) {
@@ -420,9 +423,9 @@ function wp_delete_link($link_id) {
 function wp_get_link_cats($link_ID = 0) {
 	global $wpdb;
 
-	$sql = "SELECT category_id 
-		FROM $wpdb->link2cat 
-		WHERE link_id = $link_ID 
+	$sql = "SELECT category_id
+		FROM $wpdb->link2cat
+		WHERE link_id = $link_ID
 		ORDER BY category_id";
 
 	$result = $wpdb->get_col($sql);
@@ -443,8 +446,8 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
 
 	// First the old categories
 	$old_categories = $wpdb->get_col("
-		SELECT category_id 
-		FROM $wpdb->link2cat 
+		SELECT category_id
+		FROM $wpdb->link2cat
 		WHERE link_id = $link_ID");
 
 	if (!$old_categories) {
@@ -459,9 +462,9 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
 	if ($delete_cats) {
 		foreach ($delete_cats as $del) {
 			$wpdb->query("
-				DELETE FROM $wpdb->link2cat 
-				WHERE category_id = $del 
-					AND link_id = $link_ID 
+				DELETE FROM $wpdb->link2cat
+				WHERE category_id = $del
+					AND link_id = $link_ID
 				");
 		}
 	}
@@ -472,18 +475,21 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
 	if ($add_cats) {
 		foreach ($add_cats as $new_cat) {
 			$wpdb->query("
-				INSERT INTO $wpdb->link2cat (link_id, category_id) 
+				INSERT INTO $wpdb->link2cat (link_id, category_id)
 				VALUES ($link_ID, $new_cat)");
 		}
 	}
-	
+
 	// Update category counts.
 	$all_affected_cats = array_unique(array_merge($link_categories, $old_categories));
 	foreach ( $all_affected_cats as $cat_id ) {
 		$count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->link2cat, $wpdb->links WHERE $wpdb->links.link_id = $wpdb->link2cat.link_id AND category_id = '$cat_id'");
 		$wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'");
 		wp_cache_delete($cat_id, 'category');
+		do_action('edit_category', $cat_id);
 	}
+
+	do_action('edit_link', $link_ID);
 }	// wp_set_link_cats()
 
 function post_exists($title, $content = '', $post_date = '') {
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 0f80efd..8da7ff0 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -2,7 +2,7 @@
 
 function write_post() {
 	$result = wp_write_post();
-	if( is_wp_error($result) )
+	if( is_wp_error( $result ) )
 		wp_die( $result->get_error_message() );
 	else
 		return $result;
@@ -13,11 +13,11 @@ function wp_write_post() {
 	global $user_ID;
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ( !current_user_can('edit_pages') )
-			return new WP_Error('edit_pages', __('You are not allowed to create pages on this blog.'));
+		if ( !current_user_can( 'edit_pages' ) )
+			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) );
 	} else {
-		if ( !current_user_can('edit_posts') )
-			return new WP_Error('edit_posts', __('You are not allowed to create posts or drafts on this blog.'));
+		if ( !current_user_can( 'edit_posts' ) )
+			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) );
 	}
 
 	// Rename.
@@ -26,10 +26,10 @@ function wp_write_post() {
 	$_POST['post_parent'] = $_POST['parent_id'];
 	$_POST['to_ping'] = $_POST['trackback_url'];
 
-	if (!empty ($_POST['post_author_override'])) {
+	if (!empty ( $_POST['post_author_override'] ) ) {
 		$_POST['post_author'] = (int) $_POST['post_author_override'];
 	} else {
-		if (!empty ($_POST['post_author'])) {
+		if (!empty ( $_POST['post_author'] ) ) {
 			$_POST['post_author'] = (int) $_POST['post_author'];
 		} else {
 			$_POST['post_author'] = (int) $_POST['user_ID'];
@@ -37,118 +37,118 @@ function wp_write_post() {
 
 	}
 
-	if ($_POST['post_author'] != $_POST['user_ID']) {
+	if ( $_POST['post_author'] != $_POST['user_ID'] ) {
 		if ( 'page' == $_POST['post_type'] ) {
-			if ( !current_user_can('edit_others_pages') )
-				return new WP_Error('edit_others_pages', __('You cannot create pages as this user.'));
+			if ( !current_user_can( 'edit_others_pages' ) )
+				return new WP_Error( 'edit_others_pages', __( 'You cannot create pages as this user.' ) );
 		} else {
-			if ( !current_user_can('edit_others_posts') )
-				return new WP_Error('edit_others_posts', __('You cannot post as this user.'));
+			if ( !current_user_can( 'edit_others_posts' ) )
+				return new WP_Error( 'edit_others_posts', __( 'You cannot post as this user.' ) );
 
 		}
 	}
 
 	// What to do based on which button they pressed
-	if ('' != $_POST['saveasdraft'])
+	if ('' != $_POST['saveasdraft'] )
 		$_POST['post_status'] = 'draft';
-	if ('' != $_POST['saveasprivate'])
+	if ('' != $_POST['saveasprivate'] )
 		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'])
+	if ('' != $_POST['publish'] )
 		$_POST['post_status'] = 'publish';
-	if ('' != $_POST['advanced'])
+	if ('' != $_POST['advanced'] )
 		$_POST['post_status'] = 'draft';
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ('publish' == $_POST['post_status'] && !current_user_can('publish_pages'))
+		if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
 			$_POST['post_status'] = 'draft';
 	} else {
-		if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
+		if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) )
 			$_POST['post_status'] = 'draft';
 	}
 
-	if (!isset ($_POST['comment_status']))
+	if (!isset( $_POST['comment_status'] ))
 		$_POST['comment_status'] = 'closed';
 
-	if (!isset ($_POST['ping_status']))
+	if (!isset( $_POST['ping_status'] ))
 		$_POST['ping_status'] = 'closed';
 
-	if (!empty ($_POST['edit_date'])) {
+	if (!empty ( $_POST['edit_date'] ) ) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31) ? 31 : $jj;
-		$hh = ($hh > 23) ? $hh -24 : $hh;
-		$mn = ($mn > 59) ? $mn -60 : $mn;
-		$ss = ($ss > 59) ? $ss -60 : $ss;
-		$_POST['post_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss);
-		$_POST['post_date_gmt'] = get_gmt_from_date($_POST['post_date']);
+		$jj = ($jj > 31 ) ? 31 : $jj;
+		$hh = ($hh > 23 ) ? $hh -24 : $hh;
+		$mn = ($mn > 59 ) ? $mn -60 : $mn;
+		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+		$_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
+		$_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] );
 	}
 
 	// Create the post.
-	$post_ID = wp_insert_post($_POST);
-	add_meta($post_ID);
+	$post_ID = wp_insert_post( $_POST);
+	add_meta( $post_ID );
 
 	// Reunite any orphaned attachments with their parent
 	if ( $_POST['temp_ID'] )
-		relocate_children($_POST['temp_ID'], $post_ID);
+		relocate_children( $_POST['temp_ID'], $post_ID );
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	fix_attachment_links($post_ID);
+	fix_attachment_links( $post_ID );
 
 	return $post_ID;
 }
 
 // Move child posts to a new parent
-function relocate_children($old_ID, $new_ID) {
+function relocate_children( $old_ID, $new_ID ) {
 	global $wpdb;
 	$old_ID = (int) $old_ID;
 	$new_ID = (int) $new_ID;
-	return $wpdb->query("UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID");
+	return $wpdb->query( "UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID" );
 }
 
 // Replace hrefs of attachment anchors with up-to-date permalinks.
-function fix_attachment_links($post_ID) {
+function fix_attachment_links( $post_ID ) {
 	global $wp_rewrite;
 
-	$post = & get_post($post_ID, ARRAY_A);
+	$post = & get_post( $post_ID, ARRAY_A );
 
-	$search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
+	$search = "#<a[^>]+rel=('|\" )[^'\"]*attachment[^>]*>#ie";
 
 	// See if we have any rel="attachment" links
-	if ( 0 == preg_match_all($search, $post['post_content'], $anchor_matches, PREG_PATTERN_ORDER) )
+	if ( 0 == preg_match_all( $search, $post['post_content'], $anchor_matches, PREG_PATTERN_ORDER ) )
 		return;
 
 	$i = 0;
-	$search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i";
+	$search = "#[\s]+rel=(\"|' )(.*? )wp-att-(\d+ )\\1#i";
 	foreach ( $anchor_matches[0] as $anchor ) {
-		if ( 0 == preg_match($search, $anchor, $id_matches) )
+		if ( 0 == preg_match( $search, $anchor, $id_matches ) )
 			continue;
 
 		$id = $id_matches[3];
 
 		// While we have the attachment ID, let's adopt any orphans.
-		$attachment = & get_post($id, ARRAY_A);
-		if ( ! empty($attachment) && ! is_object(get_post($attachment['post_parent'])) ) {
+		$attachment = & get_post( $id, ARRAY_A );
+		if ( ! empty( $attachment) && ! is_object( get_post( $attachment['post_parent'] ) ) ) {
 			$attachment['post_parent'] = $post_ID;
 			// Escape data pulled from DB.
-			$attachment = add_magic_quotes($attachment);
-			wp_update_post($attachment);
+			$attachment = add_magic_quotes( $attachment);
+			wp_update_post( $attachment);
 		}
 
 		$post_search[$i] = $anchor;
-		$post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
+		$post_replace[$i] = preg_replace( "#href=(\"|')[^'\"]*\\1#e", "stripslashes( 'href=\\1' ).get_attachment_link( $id ).stripslashes( '\\1' )", $anchor );
 		++$i;
 	}
 
-	$post['post_content'] = str_replace($post_search, $post_replace, $post['post_content']);
+	$post['post_content'] = str_replace( $post_search, $post_replace, $post['post_content'] );
 
 	// Escape data pulled from DB.
-	$post = add_magic_quotes($post);
+	$post = add_magic_quotes( $post);
 
-	return wp_update_post($post);
+	return wp_update_post( $post);
 }
 
 // Update an existing post with values provided in $_POST.
@@ -158,11 +158,11 @@ function edit_post() {
 	$post_ID = (int) $_POST['post_ID'];
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ( !current_user_can('edit_page', $post_ID) )
-			wp_die(__('You are not allowed to edit this page.'));
+		if ( !current_user_can( 'edit_page', $post_ID ) )
+			wp_die( __('You are not allowed to edit this page.' ));
 	} else {
-		if ( !current_user_can('edit_post', $post_ID) )
-			wp_die(__('You are not allowed to edit this post.'));
+		if ( !current_user_can( 'edit_post', $post_ID ) )
+			wp_die( __('You are not allowed to edit this post.' ));
 	}
 
 	// Rename.
@@ -172,82 +172,82 @@ function edit_post() {
 	$_POST['post_parent'] = $_POST['parent_id'];
 	$_POST['to_ping'] = $_POST['trackback_url'];
 
-	if (!empty ($_POST['post_author_override'])) {
+	if (!empty ( $_POST['post_author_override'] ) ) {
 		$_POST['post_author'] = (int) $_POST['post_author_override'];
 	} else
-		if (!empty ($_POST['post_author'])) {
+		if (!empty ( $_POST['post_author'] ) ) {
 			$_POST['post_author'] = (int) $_POST['post_author'];
 		} else {
 			$_POST['post_author'] = (int) $_POST['user_ID'];
 		}
 
-	if ($_POST['post_author'] != $_POST['user_ID']) {
+	if ( $_POST['post_author'] != $_POST['user_ID'] ) {
 		if ( 'page' == $_POST['post_type'] ) {
-			if ( !current_user_can('edit_others_pages') )
-				wp_die(__('You cannot edit pages as this user.'));
+			if ( !current_user_can( 'edit_others_pages' ) )
+				wp_die( __('You cannot edit pages as this user.' ));
 		} else {
-			if ( !current_user_can('edit_others_posts') )
-				wp_die(__('You cannot edit posts as this user.'));
+			if ( !current_user_can( 'edit_others_posts' ) )
+				wp_die( __('You cannot edit posts as this user.' ));
 
 		}
 	}
 
 	// What to do based on which button they pressed
-	if ('' != $_POST['saveasdraft'])
+	if ('' != $_POST['saveasdraft'] )
 		$_POST['post_status'] = 'draft';
-	if ('' != $_POST['saveasprivate'])
+	if ('' != $_POST['saveasprivate'] )
 		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'])
+	if ('' != $_POST['publish'] )
 		$_POST['post_status'] = 'publish';
-	if ('' != $_POST['advanced'])
+	if ('' != $_POST['advanced'] )
 		$_POST['post_status'] = 'draft';
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_pages'))
+		if ('publish' == $_POST['post_status'] && !current_user_can( 'edit_published_pages' ))
 			$_POST['post_status'] = 'draft';
 	} else {
-		if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_posts'))
+		if ('publish' == $_POST['post_status'] && !current_user_can( 'edit_published_posts' ))
 			$_POST['post_status'] = 'draft';
 	}
 
-	if (!isset ($_POST['comment_status']))
+	if (!isset( $_POST['comment_status'] ))
 		$_POST['comment_status'] = 'closed';
 
-	if (!isset ($_POST['ping_status']))
+	if (!isset( $_POST['ping_status'] ))
 		$_POST['ping_status'] = 'closed';
 
-	if (!empty ($_POST['edit_date'])) {
+	if (!empty ( $_POST['edit_date'] ) ) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31) ? 31 : $jj;
-		$hh = ($hh > 23) ? $hh -24 : $hh;
-		$mn = ($mn > 59) ? $mn -60 : $mn;
-		$ss = ($ss > 59) ? $ss -60 : $ss;
+		$jj = ($jj > 31 ) ? 31 : $jj;
+		$hh = ($hh > 23 ) ? $hh -24 : $hh;
+		$mn = ($mn > 59 ) ? $mn -60 : $mn;
+		$ss = ($ss > 59 ) ? $ss -60 : $ss;
 		$_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-		$_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
+		$_POST['post_date_gmt'] = get_gmt_from_date( "$aa-$mm-$jj $hh:$mn:$ss" );
 	}
 
 	// Meta Stuff
-	if ($_POST['meta']) {
-		foreach ($_POST['meta'] as $key => $value)
-			update_meta($key, $value['key'], $value['value']);
+	if ( $_POST['meta'] ) {
+		foreach ( $_POST['meta'] as $key => $value )
+			update_meta( $key, $value['key'], $value['value'] );
 	}
 
-	if ($_POST['deletemeta']) {
-		foreach ($_POST['deletemeta'] as $key => $value)
-			delete_meta($key);
+	if ( $_POST['deletemeta'] ) {
+		foreach ( $_POST['deletemeta'] as $key => $value )
+			delete_meta( $key );
 	}
 
-	add_meta($post_ID);
+	add_meta( $post_ID );
 
-	wp_update_post($_POST);
+	wp_update_post( $_POST);
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	fix_attachment_links($post_ID);
+	fix_attachment_links( $post_ID );
 
 	return $post_ID;
 }
@@ -258,8 +258,8 @@ function edit_comment() {
 	$comment_ID = (int) $_POST['comment_ID'];
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
 
-	if (!current_user_can('edit_post', $comment_post_ID))
-		wp_die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.'));
+	if (!current_user_can( 'edit_post', $comment_post_ID ))
+		wp_die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.' ));
 
 	$_POST['comment_author'] = $_POST['newcomment_author'];
 	$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
@@ -268,78 +268,78 @@ function edit_comment() {
 	$_POST['comment_content'] = $_POST['content'];
 	$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
-	if (!empty ($_POST['edit_date'])) {
+	if (!empty ( $_POST['edit_date'] ) ) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31) ? 31 : $jj;
-		$hh = ($hh > 23) ? $hh -24 : $hh;
-		$mn = ($mn > 59) ? $mn -60 : $mn;
-		$ss = ($ss > 59) ? $ss -60 : $ss;
+		$jj = ($jj > 31 ) ? 31 : $jj;
+		$hh = ($hh > 23 ) ? $hh -24 : $hh;
+		$mn = ($mn > 59 ) ? $mn -60 : $mn;
+		$ss = ($ss > 59 ) ? $ss -60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	wp_update_comment($_POST);
+	wp_update_comment( $_POST);
 }
 
 // Get an existing post and format it for editing.
-function get_post_to_edit($id) {
+function get_post_to_edit( $id ) {
 
-	$post = get_post($id);
+	$post = get_post( $id );
 
-	$post->post_content = format_to_edit($post->post_content, user_can_richedit());
-	$post->post_content = apply_filters('content_edit_pre', $post->post_content);
+	$post->post_content = format_to_edit( $post->post_content, user_can_richedit() );
+	$post->post_content = apply_filters( 'content_edit_pre', $post->post_content);
 
-	$post->post_excerpt = format_to_edit($post->post_excerpt);
-	$post->post_excerpt = apply_filters('excerpt_edit_pre', $post->post_excerpt);
+	$post->post_excerpt = format_to_edit( $post->post_excerpt);
+	$post->post_excerpt = apply_filters( 'excerpt_edit_pre', $post->post_excerpt);
 
-	$post->post_title = format_to_edit($post->post_title);
-	$post->post_title = apply_filters('title_edit_pre', $post->post_title);
+	$post->post_title = format_to_edit( $post->post_title );
+	$post->post_title = apply_filters( 'title_edit_pre', $post->post_title );
 
-	$post->post_password = format_to_edit($post->post_password);
+	$post->post_password = format_to_edit( $post->post_password );
 
-	if ($post->post_type == 'page')
-		$post->page_template = get_post_meta($id, '_wp_page_template', true);
+	if ( $post->post_type == 'page' )
+		$post->page_template = get_post_meta( $id, '_wp_page_template', true );
 
 	return $post;
 }
 
 // Default post information to use when populating the "Write Post" form.
 function get_default_post_to_edit() {
-	if ( !empty($_REQUEST['post_title']) )
-		$post_title = wp_specialchars(stripslashes($_REQUEST['post_title']));
-	else if ( !empty($_REQUEST['popuptitle']) ) {
-		$post_title = wp_specialchars(stripslashes($_REQUEST['popuptitle']));
-		$post_title = funky_javascript_fix($post_title);
+	if ( !empty( $_REQUEST['post_title'] ) )
+		$post_title = wp_specialchars( stripslashes( $_REQUEST['post_title'] ));
+	else if ( !empty( $_REQUEST['popuptitle'] ) ) {
+		$post_title = wp_specialchars( stripslashes( $_REQUEST['popuptitle'] ));
+		$post_title = funky_javascript_fix( $post_title );
 	} else {
 		$post_title = '';
 	}
 
-	if ( !empty($_REQUEST['content']) )
-		$post_content = wp_specialchars(stripslashes($_REQUEST['content']));
-	else if ( !empty($post_title) ) {
-		$text       = wp_specialchars(stripslashes(urldecode($_REQUEST['text'])));
-		$text       = funky_javascript_fix($text);
-		$popupurl   = wp_specialchars($_REQUEST['popupurl']);
+	if ( !empty( $_REQUEST['content'] ) )
+		$post_content = wp_specialchars( stripslashes( $_REQUEST['content'] ));
+	else if ( !empty( $post_title ) ) {
+		$text       = wp_specialchars( stripslashes( urldecode( $_REQUEST['text'] ) ) );
+		$text       = funky_javascript_fix( $text);
+		$popupurl   = wp_specialchars( $_REQUEST['popupurl'] );
         $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
     }
 
-	if ( !empty($_REQUEST['excerpt']) )
-		$post_excerpt = wp_specialchars(stripslashes($_REQUEST['excerpt']));
+	if ( !empty( $_REQUEST['excerpt'] ) )
+		$post_excerpt = wp_specialchars( stripslashes( $_REQUEST['excerpt'] ));
 	else
 		$post_excerpt = '';
 
 	$post->post_status = 'draft';
-	$post->comment_status = get_option('default_comment_status');
-	$post->ping_status = get_option('default_ping_status');
-	$post->post_pingback = get_option('default_pingback_flag');
-	$post->post_category = get_option('default_category');
-	$post->post_content = apply_filters('default_content', $post_content);
-	$post->post_title = apply_filters('default_title', $post_title);
-	$post->post_excerpt = apply_filters('default_excerpt', $post_excerpt);
+	$post->comment_status = get_option( 'default_comment_status' );
+	$post->ping_status = get_option( 'default_ping_status' );
+	$post->post_pingback = get_option( 'default_pingback_flag' );
+	$post->post_category = get_option( 'default_category' );
+	$post->post_content = apply_filters( 'default_content', $post_content);
+	$post->post_title = apply_filters( 'default_title', $post_title );
+	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt);
 	$post->page_template = 'default';
 	$post->post_parent = 0;
 	$post->menu_order = 0;
@@ -347,21 +347,21 @@ function get_default_post_to_edit() {
 	return $post;
 }
 
-function get_comment_to_edit($id) {
-	$comment = get_comment($id);
+function get_comment_to_edit( $id ) {
+	$comment = get_comment( $id );
 
-	$comment->comment_content = format_to_edit($comment->comment_content, user_can_richedit());
-	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
+	$comment->comment_content = format_to_edit( $comment->comment_content, user_can_richedit() );
+	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author = format_to_edit($comment->comment_author);
-	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
-	$comment->comment_author_url = format_to_edit($comment->comment_author_url);
+	$comment->comment_author = format_to_edit( $comment->comment_author );
+	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
+	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
 
 	return $comment;
 }
 
-function get_category_to_edit($id) {
-	$category = get_category($id);
+function get_category_to_edit( $id ) {
+	$category = get_category( $id );
 
 	return $category;
 }
@@ -369,7 +369,7 @@ function get_category_to_edit($id) {
 function wp_dropdown_roles( $default = false ) {
 	global $wp_roles;
 	$r = '';
-	foreach($wp_roles->role_names as $role => $name)
+	foreach( $wp_roles->role_names as $role => $name )
 		if ( $default == $role ) // Make default first in list
 			$p = "\n\t<option selected='selected' value='$role'>$name</option>";
 		else
@@ -378,19 +378,19 @@ function wp_dropdown_roles( $default = false ) {
 }
 
 
-function get_user_to_edit($user_id) {
-	$user = new WP_User($user_id);
-	$user->user_login = wp_specialchars($user->user_login, 1);
-	$user->user_email = wp_specialchars($user->user_email, 1);
-	$user->user_url = wp_specialchars($user->user_url, 1);
-	$user->first_name = wp_specialchars($user->first_name, 1);
-	$user->last_name = wp_specialchars($user->last_name, 1);
-	$user->display_name = wp_specialchars($user->display_name, 1);
-	$user->nickname = wp_specialchars($user->nickname, 1);
-	$user->aim = wp_specialchars($user->aim, 1);
-	$user->yim = wp_specialchars($user->yim, 1);
-	$user->jabber = wp_specialchars($user->jabber, 1);
-	$user->description = wp_specialchars($user->description);
+function get_user_to_edit( $user_id ) {
+	$user = new WP_User( $user_id );
+	$user->user_login = wp_specialchars( $user->user_login, 1 );
+	$user->user_email = wp_specialchars( $user->user_email, 1 );
+	$user->user_url = wp_specialchars( $user->user_url, 1 );
+	$user->first_name = wp_specialchars( $user->first_name, 1 );
+	$user->last_name = wp_specialchars( $user->last_name, 1 );
+	$user->display_name = wp_specialchars( $user->display_name, 1 );
+	$user->nickname = wp_specialchars( $user->nickname, 1 );
+	$user->aim = wp_specialchars( $user->aim, 1 );
+	$user->yim = wp_specialchars( $user->yim, 1 );
+	$user->jabber = wp_specialchars( $user->jabber, 1 );
+	$user->description = wp_specialchars( $user->description );
 
 	return $user;
 }
@@ -400,147 +400,147 @@ function get_user_to_edit($user_id) {
 function add_user() {
 	if ( func_num_args() ) { // The hackiest hack that ever did hack
 		global $current_user, $wp_roles;
-		$user_id = func_get_arg(0);
+		$user_id = func_get_arg( 0 );
 
-		if (isset ($_POST['role'])) {
-			if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users')) {
-				$user = new WP_User($user_id);
-				$user->set_role($_POST['role']);
+		if ( isset( $_POST['role'] ) ) {
+			if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' ) ) {
+				$user = new WP_User( $user_id );
+				$user->set_role( $_POST['role'] );
 			}
 		}
 	} else {
-		add_action('user_register', 'add_user'); // See above
+		add_action( 'user_register', 'add_user' ); // See above
 		return edit_user();
 	}
 }
 
-function edit_user($user_id = 0) {
+function edit_user( $user_id = 0 ) {
 	global $current_user, $wp_roles, $wpdb;
-	if ($user_id != 0) {
+	if ( $user_id != 0 ) {
 		$update = true;
 		$user->ID = $user_id;
-		$userdata = get_userdata($user_id);
-		$user->user_login = $wpdb->escape($userdata->user_login);
+		$userdata = get_userdata( $user_id );
+		$user->user_login = $wpdb->escape( $userdata->user_login );
 	} else {
 		$update = false;
 		$user = '';
 	}
 
-	if (isset ($_POST['user_login']))
-		$user->user_login = wp_specialchars(trim($_POST['user_login']));
+	if ( isset( $_POST['user_login'] ))
+		$user->user_login = wp_specialchars( trim( $_POST['user_login'] ));
 
 	$pass1 = $pass2 = '';
-	if (isset ($_POST['pass1']))
+	if ( isset( $_POST['pass1'] ))
 		$pass1 = $_POST['pass1'];
-	if (isset ($_POST['pass2']))
+	if ( isset( $_POST['pass2'] ))
 		$pass2 = $_POST['pass2'];
 
-	if (isset ($_POST['role']) && current_user_can('edit_users')) { 
-		if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
+	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { 
+		if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' ))
 			$user->role = $_POST['role'];
 	}
 
-	if (isset ($_POST['email']))
-		$user->user_email = wp_specialchars(trim($_POST['email']));
-	if (isset ($_POST['url'])) {
-		$user->user_url = wp_specialchars(trim($_POST['url']));
-		$user->user_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
-	}
-	if (isset ($_POST['first_name']))
-		$user->first_name = wp_specialchars(trim($_POST['first_name']));
-	if (isset ($_POST['last_name']))
-		$user->last_name = wp_specialchars(trim($_POST['last_name']));
-	if (isset ($_POST['nickname']))
-		$user->nickname = wp_specialchars(trim($_POST['nickname']));
-	if (isset ($_POST['display_name']))
-		$user->display_name = wp_specialchars(trim($_POST['display_name']));
-	if (isset ($_POST['description']))
-		$user->description = trim($_POST['description']);
-	if (isset ($_POST['jabber']))
-		$user->jabber = wp_specialchars(trim($_POST['jabber']));
-	if (isset ($_POST['aim']))
-		$user->aim = wp_specialchars(trim($_POST['aim']));
-	if (isset ($_POST['yim']))
-		$user->yim = wp_specialchars(trim($_POST['yim']));
+	if ( isset( $_POST['email'] ))
+		$user->user_email = wp_specialchars( trim( $_POST['email'] ));
+	if ( isset( $_POST['url'] ) ) {
+		$user->user_url = wp_specialchars( trim( $_POST['url'] ));
+		$user->user_url = preg_match( '/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url ) ? $user->user_url : 'http://'.$user->user_url;
+	}
+	if ( isset( $_POST['first_name'] ))
+		$user->first_name = wp_specialchars( trim( $_POST['first_name'] ));
+	if ( isset( $_POST['last_name'] ))
+		$user->last_name = wp_specialchars( trim( $_POST['last_name'] ));
+	if ( isset( $_POST['nickname'] ))
+		$user->nickname = wp_specialchars( trim( $_POST['nickname'] ));
+	if ( isset( $_POST['display_name'] ))
+		$user->display_name = wp_specialchars( trim( $_POST['display_name'] ));
+	if ( isset( $_POST['description'] ))
+		$user->description = trim( $_POST['description'] );
+	if ( isset( $_POST['jabber'] ))
+		$user->jabber = wp_specialchars( trim( $_POST['jabber'] ));
+	if ( isset( $_POST['aim'] ))
+		$user->aim = wp_specialchars( trim( $_POST['aim'] ));
+	if ( isset( $_POST['yim'] ))
+		$user->yim = wp_specialchars( trim( $_POST['yim'] ));
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ($user->user_login == '')
-		$errors->add('user_login', __('<strong>ERROR</strong>: Please enter a username.'));
+	if ( $user->user_login == '' )
+		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ));
 
 	/* checking the password has been typed twice */
-	do_action_ref_array('check_passwords', array ($user->user_login, & $pass1, & $pass2));
+	do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
 
-	if (!$update) {
-		if ($pass1 == '' || $pass2 == '')
-			$errors->add('pass', __('<strong>ERROR</strong>: Please enter your password twice.'));
+	if (!$update ) {
+		if ( $pass1 == '' || $pass2 == '' )
+			$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter your password twice.' ));
 	} else {
-		if ((empty ($pass1) && !empty ($pass2)) || (empty ($pass2) && !empty ($pass1)))
-			$errors->add('pass', __("<strong>ERROR</strong>: you typed your new password only once."));
+		if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) )
+			$errors->add( 'pass', __( "<strong>ERROR</strong>: you typed your new password only once." ));
 	}
 
 	/* Check for "\" in password */
 	if( strpos( " ".$pass1, "\\" ) )
-		$errors->add('pass', __('<strong>ERROR</strong>: Passwords may not contain the character "\\".'));
+		$errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ));
 
 	/* checking the password has been typed twice the same */
-	if ($pass1 != $pass2)
-		$errors->add('pass', __('<strong>ERROR</strong>: Please type the same password in the two password fields.'));
+	if ( $pass1 != $pass2 )
+		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please type the same password in the two password fields.' ));
 
-	if (!empty ($pass1))
+	if (!empty ( $pass1 ))
 		$user->user_pass = $pass1;
 
-	if ( !validate_username($user->user_login) )
-		$errors->add('user_login', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.'));
+	if ( !validate_username( $user->user_login ) )
+		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.' ));
 
-	if (!$update && username_exists($user->user_login))
-		$errors->add('user_login', __('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
+	if (!$update && username_exists( $user->user_login ))
+		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ));
 
 	/* checking e-mail address */
-	if (empty ($user->user_email)) {
-		$errors->add('user_email', __("<strong>ERROR</strong>: please type an e-mail address"));
+	if ( empty ( $user->user_email ) ) {
+		$errors->add( 'user_email', __( "<strong>ERROR</strong>: please type an e-mail address" ));
 	} else
-		if (!is_email($user->user_email)) {
-			$errors->add('user_email', __("<strong>ERROR</strong>: the email address isn't correct"));
+		if (!is_email( $user->user_email ) ) {
+			$errors->add( 'user_email', __( "<strong>ERROR</strong>: the email address isn't correct" ));
 		}
 
 	if ( $errors->get_error_codes() )
 		return $errors;
 
-	if ($update) {
-		$user_id = wp_update_user(get_object_vars($user));
+	if ( $update ) {
+		$user_id = wp_update_user( get_object_vars( $user ));
 	} else {
-		$user_id = wp_insert_user(get_object_vars($user));
-		wp_new_user_notification($user_id);
+		$user_id = wp_insert_user( get_object_vars( $user ));
+		wp_new_user_notification( $user_id );
 	}
 	return $user_id;
 }
 
 
-function get_link_to_edit($link_id) {
-	$link = get_link($link_id);
+function get_link_to_edit( $link_id ) {
+	$link = get_link( $link_id );
 
-	$link->link_url = wp_specialchars($link->link_url, 1);
-	$link->link_name = wp_specialchars($link->link_name, 1);
-	$link->link_image = wp_specialchars($link->link_image, 1);
-	$link->link_description = wp_specialchars($link->link_description, 1);
-	$link->link_notes = wp_specialchars($link->link_notes);
-	$link->link_rss = wp_specialchars($link->link_rss, 1);
-	$link->link_rel = wp_specialchars($link->link_rel, 1);
+	$link->link_url = wp_specialchars( $link->link_url, 1 );
+	$link->link_name = wp_specialchars( $link->link_name, 1 );
+	$link->link_image = wp_specialchars( $link->link_image, 1 );
+	$link->link_description = wp_specialchars( $link->link_description, 1 );
+	$link->link_notes = wp_specialchars( $link->link_notes );
+	$link->link_rss = wp_specialchars( $link->link_rss, 1 );
+	$link->link_rel = wp_specialchars( $link->link_rel, 1 );
 	$link->post_category = $link->link_category;
 
 	return $link;
 }
 
 function get_default_link_to_edit() {
-	if ( isset($_GET['linkurl']) )
-		$link->link_url = wp_specialchars($_GET['linkurl'], 1);
+	if ( isset( $_GET['linkurl'] ) )
+		$link->link_url = wp_specialchars( $_GET['linkurl'], 1 );
 	else
 		$link->link_url = '';
 
-	if ( isset($_GET['name']) )
-		$link->link_name = wp_specialchars($_GET['name'], 1);
+	if ( isset( $_GET['name'] ) )
+		$link->link_name = wp_specialchars( $_GET['name'], 1 );
 	else
 		$link->link_name = '';
 
@@ -553,76 +553,76 @@ function add_link() {
 	return edit_link();
 }
 
-function edit_link($link_id = '') {
-	if (!current_user_can('manage_links'))
-		wp_die(__("Cheatin' uh ?"));
+function edit_link( $link_id = '' ) {
+	if (!current_user_can( 'manage_links' ))
+		wp_die( __("Cheatin' uh ?" ));
 
-	$_POST['link_url'] = wp_specialchars($_POST['link_url']);
-	$_POST['link_url'] = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $_POST['link_url']) ? $_POST['link_url'] : 'http://' . $_POST['link_url'];
-	$_POST['link_name'] = wp_specialchars($_POST['link_name']);
-	$_POST['link_image'] = wp_specialchars($_POST['link_image']);
-	$_POST['link_rss'] = wp_specialchars($_POST['link_rss']);
+	$_POST['link_url'] = wp_specialchars( $_POST['link_url'] );
+	$_POST['link_url'] = preg_match( '/^(https?|ftps?|mailto|news|gopher):/is', $_POST['link_url'] ) ? $_POST['link_url'] : 'http://' . $_POST['link_url'];
+	$_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
+	$_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
+	$_POST['link_rss'] = wp_specialchars( $_POST['link_rss'] );
 	$_POST['link_category'] = $_POST['post_category'];
 
-	if ( !empty($link_id) ) {
+	if ( !empty( $link_id ) ) {
 		$_POST['link_id'] = $link_id;
-		return wp_update_link($_POST);
+		return wp_update_link( $_POST);
 	} else {
-		return wp_insert_link($_POST);
+		return wp_insert_link( $_POST);
 	}
 }
 
-function url_shorten($url) {
-	$short_url = str_replace('http://', '', stripslashes($url));
-	$short_url = str_replace('www.', '', $short_url);
-	if ('/' == substr($short_url, -1))
-		$short_url = substr($short_url, 0, -1);
-	if (strlen($short_url) > 35)
-		$short_url = substr($short_url, 0, 32).'...';
+function url_shorten( $url ) {
+	$short_url = str_replace( 'http://', '', stripslashes( $url ));
+	$short_url = str_replace( 'www.', '', $short_url );
+	if ('/' == substr( $short_url, -1 ))
+		$short_url = substr( $short_url, 0, -1 );
+	if ( strlen( $short_url ) > 35 )
+		$short_url = substr( $short_url, 0, 32 ).'...';
 	return $short_url;
 }
 
-function selected($selected, $current) {
-	if ($selected == $current)
+function selected( $selected, $current) {
+	if ( $selected == $current)
 		echo ' selected="selected"';
 }
 
-function checked($checked, $current) {
-	if ($checked == $current)
+function checked( $checked, $current) {
+	if ( $checked == $current)
 		echo ' checked="checked"';
 }
 
-function return_categories_list($parent = 0) {
+function return_categories_list( $parent = 0 ) {
 	global $wpdb;
-	return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY category_count DESC");
+	return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY category_count DESC" );
 }
 
-function sort_cats($cat1, $cat2) {
-	return strcasecmp($cat1['cat_name'], $cat2['cat_name']);
+function sort_cats( $cat1, $cat2 ) {
+	return strcasecmp( $cat1['cat_name'], $cat2['cat_name'] );
 }
 
-function get_nested_categories($default = 0, $parent = 0) {
+function get_nested_categories( $default = 0, $parent = 0 ) {
 	global $post_ID, $link_id, $mode, $wpdb;
 
-	if ($post_ID) {
-		$checked_categories = $wpdb->get_col("
+	if ( $post_ID ) {
+		$checked_categories = $wpdb->get_col( "
 		     SELECT category_id
 		     FROM $wpdb->categories, $wpdb->post2cat
 		     WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
-		     ");
+		     " );
 
-		if (count($checked_categories) == 0) {
+		if ( count( $checked_categories ) == 0 ) {
 			// No selected categories, strange
 			$checked_categories[] = $default;
 		}
-	} else if ($link_id) {
-		$checked_categories = $wpdb->get_col("
+	} else if ( $link_id ) {
+		$checked_categories = $wpdb->get_col( "
 		     SELECT category_id
 		     FROM $wpdb->categories, $wpdb->link2cat
 		     WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
-		     ");
+		     " );
 
-		if (count($checked_categories) == 0) {
+		if ( count( $checked_categories ) == 0 ) {
 			// No selected categories, strange
 			$checked_categories[] = $default;
 		}	
@@ -630,59 +630,59 @@ function get_nested_categories($default = 0, $parent = 0) {
 		$checked_categories[] = $default;
 	}
 
-	$cats = return_categories_list($parent);
+	$cats = return_categories_list( $parent);
 	$result = array ();
 
-	if (is_array($cats)) {
-		foreach ($cats as $cat) {
+	if ( is_array( $cats ) ) {
+		foreach ( $cats as $cat) {
 			if ( $cat == 0 ) { // HACK, added 2006-05-13
 				$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = 0");
 				continue;
 			}
-			$result[$cat]['children'] = get_nested_categories($default, $cat);
+			$result[$cat]['children'] = get_nested_categories( $default, $cat);
 			$result[$cat]['cat_ID'] = $cat;
-			$result[$cat]['checked'] = in_array($cat, $checked_categories);
-			$result[$cat]['cat_name'] = get_the_category_by_ID($cat);
+			$result[$cat]['checked'] = in_array( $cat, $checked_categories );
+			$result[$cat]['cat_name'] = get_the_category_by_ID( $cat);
 		}
 	}
 
-	usort($result, 'sort_cats');
+	usort( $result, 'sort_cats' );
 
 	return $result;
 }
 
-function write_nested_categories($categories) {
-	foreach ($categories as $category) {
-		echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label></li>\n";
+function write_nested_categories( $categories ) {
+	foreach ( $categories as $category ) {
+		echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( $category['cat_name'] ), "</label></li>";
 
 		if ( $category['children'] ) {
 			echo "<ul>\n";
-			write_nested_categories($category['children']);
+			write_nested_categories( $category['children'] );
 			echo "</ul>\n";
 		}
 	}
 }
 
-function dropdown_categories($default = 0) {
-	write_nested_categories(get_nested_categories($default));
+function dropdown_categories( $default = 0 ) {
+	write_nested_categories( get_nested_categories( $default) );
 }
 
-function return_link_categories_list($parent = 0) {
+function return_link_categories_list( $parent = 0 ) {
 	global $wpdb;
-	return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY link_count DESC");
+	return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY link_count DESC" );
 }
 
 function get_nested_link_categories( $default = 0, $parent = 0 ) {
 	global $post_ID, $link_id, $mode, $wpdb;
 
-	if ($link_id) {
-		$checked_categories = $wpdb->get_col("
+	if ( $link_id ) {
+		$checked_categories = $wpdb->get_col( "
 		     SELECT category_id
 		     FROM $wpdb->categories, $wpdb->link2cat
 		     WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
-		     ");
+		     " );
 
-		if (count($checked_categories) == 0) {
+		if ( count( $checked_categories ) == 0 ) {
 			// No selected categories, strange
 			$checked_categories[] = $default;
 		}	
@@ -690,43 +690,43 @@ function get_nested_link_categories( $default = 0, $parent = 0 ) {
 		$checked_categories[] = $default;
 	}
 
-	$cats = return_link_categories_list($parent);
+	$cats = return_link_categories_list( $parent);
 	$result = array ();
 
-	if (is_array($cats)) {
-		foreach ($cats as $cat) {
-			$result[$cat]['children'] = get_nested_link_categories($default, $cat);
+	if ( is_array( $cats ) ) {
+		foreach ( $cats as $cat) {
+			$result[$cat]['children'] = get_nested_link_categories( $default, $cat);
 			$result[$cat]['cat_ID'] = $cat;
-			$result[$cat]['checked'] = in_array($cat, $checked_categories);
-			$result[$cat]['cat_name'] = get_the_category_by_ID($cat);
+			$result[$cat]['checked'] = in_array( $cat, $checked_categories );
+			$result[$cat]['cat_name'] = get_the_category_by_ID( $cat);
 		}
 	}
 
-	usort($result, 'sort_cats');
+	usort( $result, 'sort_cats' );
 
 	return $result;
 }
 
-function dropdown_link_categories($default = 0) {
-	write_nested_categories(get_nested_link_categories($default));
+function dropdown_link_categories( $default = 0 ) {
+	write_nested_categories( get_nested_link_categories( $default) );
 }
 
 // Dandy new recursive multiple category stuff.
-function cat_rows($parent = 0, $level = 0, $categories = 0) {
+function cat_rows( $parent = 0, $level = 0, $categories = 0 ) {
 	global $wpdb, $class;
 
-	if (!$categories)
-		$categories = get_categories('hide_empty=0');
+	if (!$categories )
+		$categories = get_categories( 'hide_empty=0' );
 
-	if ($categories) {
-		foreach ($categories as $category) {
+	if ( $categories ) {
+		foreach ( $categories as $category ) {
 			if ( $category->cat_ID == 0 ) { // HACK, added 2006-05-13
 				$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = 0");
 				continue;
 			}
-			if ($category->category_parent == $parent) {
+			if ( $category->category_parent == $parent) {
 				echo "\t" . _cat_row( $category, $level );
-				cat_rows($category->cat_ID, $level +1, $categories);
+				cat_rows( $category->cat_ID, $level +1, $categories );
 			}
 		}
 	} else {
@@ -737,20 +737,20 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) {
 function _cat_row( $category, $level, $name_override = false ) {
 	global $class;
 
-	$pad = str_repeat('&#8212; ', $level);
-	if ( current_user_can('manage_categories') ) {
-		$edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td>";
-		$default_cat_id = get_option('default_category');
-		$default_link_cat_id = get_option('default_link_category');
+	$pad = str_repeat( '&#8212; ', $level );
+	if ( current_user_can( 'manage_categories' ) ) {
+		$edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__( 'Edit' )."</a></td>";
+		$default_cat_id = get_option( 'default_category' );
+		$default_link_cat_id = get_option( 'default_link_category' );
 
-		if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) )
-			$edit .= "<td><a href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category &quot;%s&quot;.\\nAll of its posts will go into the default category of &quot;%s&quot;\\nAll of its bookmarks will go into the default category of &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete')."</a>";
+		if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
+			$edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf( __("You are about to delete the category &quot;%s&quot;.\\nAll of its posts will go into the default category of &quot;%s&quot;\\nAll of its bookmarks will go into the default category of &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), js_escape( $category->cat_name ), js_escape( get_catname( $default_cat_id )), js_escape( get_catname( $default_link_cat_id ) ) ) . "' );\" class='delete'>".__( 'Delete' )."</a>";
 		else
-			$edit .= "<td style='text-align:center'>".__("Default");
+			$edit .= "<td style='text-align:center'>".__( "Default" );
 	} else
 		$edit = '';
 
-	$class = ( ( defined('DOING_AJAX') && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
+	$class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
 
 	$category->category_count = number_format( $category->category_count );
 	$category->link_count = number_format( $category->link_count );
@@ -763,91 +763,90 @@ function _cat_row( $category, $level, $name_override = false ) {
 		<td>$edit</td>\n\t</tr>\n";
 }
 
-function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) {
+function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
 	global $wpdb, $class, $post;
 
-	if (!$pages)
-		$pages = get_pages('sort_column=menu_order');
+	if (!$pages )
+		$pages = get_pages( 'sort_column=menu_order' );
 
-	if (! $pages)
+	if (! $pages )
 		return false;
 
-	foreach ($pages as $post) {
-		setup_postdata($post);
+	foreach ( $pages as $post) {
+		setup_postdata( $post);
 		if ( $hierarchy && ($post->post_parent != $parent) )
 			continue;
 
-		$post->post_title = wp_specialchars($post->post_title);
-		$pad = str_repeat('&#8212; ', $level);
+		$post->post_title = wp_specialchars( $post->post_title );
+		$pad = str_repeat( '&#8212; ', $level );
 		$id = $post->ID;
-		$class = ('alternate' == $class) ? '' : 'alternate';
+		$class = ('alternate' == $class ) ? '' : 'alternate';
 ?>
   <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'> 
     <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th> 
     <td>
       <?php echo $pad; ?><?php the_title() ?>
-      <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?>
     </td> 
     <td><?php the_author() ?></td>
-    <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td> 
-	<td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
-    <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
-    <td><?php if ( current_user_can('delete_page', $id) ) { echo "<a href='" . wp_nonce_url("page.php?action=delete&amp;post=$id", 'delete-page_' . $id) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . "</a>"; } ?></td> 
+    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( 'Y-m-d g:i a', $post->post_modified ); ?></td> 
+	<td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e( 'View' ); ?></a></td>
+    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td> 
+    <td><?php if ( current_user_can( 'delete_page', $id ) ) { echo "<a href='" . wp_nonce_url( "page.php?action=delete&amp;post=$id", 'delete-page_' . $id ) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf( __("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), js_escape( get_the_title() ) ) . "' );\">" . __( 'Delete' ) . "</a>"; } ?></td> 
   </tr> 
 
 <?php
-		if ( $hierarchy) page_rows($id, $level + 1, $pages);
+		if ( $hierarchy ) page_rows( $id, $level + 1, $pages );
 	}
 }
 
 function user_row( $user_object, $style = '' ) {
 	global $current_user;
 
-	if ( !(is_object($user_object) && is_a($user_object, 'WP_User')) )
+	if ( !(is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
 		$user_object = new WP_User( (int) $user_object );
 	$email = $user_object->user_email;
 	$url = $user_object->user_url;
-	$short_url = str_replace('http://', '', $url);
-	$short_url = str_replace('www.', '', $short_url);
-	if ('/' == substr($short_url, -1))
-		$short_url = substr($short_url, 0, -1);
-	if (strlen($short_url) > 35)
-		$short_url =  substr($short_url, 0, 32).'...';
-	$numposts = get_usernumposts($user_object->ID);
+	$short_url = str_replace( 'http://', '', $url );
+	$short_url = str_replace( 'www.', '', $short_url );
+	if ('/' == substr( $short_url, -1 ))
+		$short_url = substr( $short_url, 0, -1 );
+	if ( strlen( $short_url ) > 35 )
+		$short_url =  substr( $short_url, 0, 32 ).'...';
+	$numposts = get_usernumposts( $user_object->ID );
 	$r = "<tr id='user-$user_object->ID'$style>
 		<td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
 		<td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
 		<td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
-		<td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
+		<td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
 		<td><a href='$url' title='website: $url'>$short_url</a></td>";
 	$r .= "\n\t\t<td align='center'>";
-	if ($numposts > 0) {
-		$r .= "<a href='edit.php?author=$user_object->ID' title='" . __('View posts by this author') . "' class='edit'>";
-		$r .= sprintf(__('View %1$s %2$s'), $numposts, __ngettext('post', 'posts', $numposts));
+	if ( $numposts > 0 ) {
+		$r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
+		$r .= sprintf( __('View %1$s %2$s' ), $numposts, __ngettext( 'post', 'posts', $numposts ));
 	}
 	$r .= "</td>\n\t\t<td>";
-	$edit_link = add_query_arg('wp_http_referer', wp_specialchars(urlencode(stripslashes($_SERVER['REQUEST_URI']))), "user-edit.php?user_id=$user_object->ID");
+	$edit_link = add_query_arg( 'wp_http_referer', wp_specialchars( urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
 	if ( ( is_site_admin() || $current_user->ID == $user_object->ID ) && current_user_can('edit_user', $user_object->ID) )
-		$r .= "<a href='$edit_link' class='edit'>".__('Edit')."</a>";
+		$r .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>";
 	$r .= "</td>\n\t</tr>";
 	return $r;
 }
 
-function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
+function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	global $wpdb;
-	if (!$categories)
-		$categories = get_categories('hide_empty=0');
-
-	if ($categories) {
-		foreach ($categories as $category) {
-			if ($currentcat != $category->cat_ID && $parent == $category->category_parent) {
-				$pad = str_repeat('&#8211; ', $level);
-				$category->cat_name = wp_specialchars($category->cat_name);
+	if (!$categories )
+		$categories = get_categories( 'hide_empty=0' );
+
+	if ( $categories ) {
+		foreach ( $categories as $category ) {
+			if ( $currentcat != $category->cat_ID && $parent == $category->category_parent) {
+				$pad = str_repeat( '&#8211; ', $level );
+				$category->cat_name = wp_specialchars( $category->cat_name );
 				echo "\n\t<option value='$category->cat_ID'";
-				if ($currentparent == $category->cat_ID)
+				if ( $currentparent == $category->cat_ID )
 					echo " selected='selected'";
 				echo ">$pad$category->cat_name</option>";
-				wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level +1, $categories);
+				wp_dropdown_cats( $currentcat, $currentparent, $category->cat_ID, $level +1, $categories );
 			}
 		}
 	} else {
@@ -855,45 +854,45 @@ function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $lev
 	}
 }
 
-function wp_create_thumbnail($file, $max_side, $effect = '') {
+function wp_create_thumbnail( $file, $max_side, $effect = '' ) {
 
 		// 1 = GIF, 2 = JPEG, 3 = PNG
 
-	if (file_exists($file)) {
-		$type = getimagesize($file);
+	if ( file_exists( $file ) ) {
+		$type = getimagesize( $file );
 
 		// if the associated function doesn't exist - then it's not
 		// handle. duh. i hope.
 
-		if (!function_exists('imagegif') && $type[2] == 1) {
-			$error = __('Filetype not supported. Thumbnail not created.');
+		if (!function_exists( 'imagegif' ) && $type[2] == 1 ) {
+			$error = __( 'Filetype not supported. Thumbnail not created.' );
 		}
-		elseif (!function_exists('imagejpeg') && $type[2] == 2) {
-			$error = __('Filetype not supported. Thumbnail not created.');
+		elseif (!function_exists( 'imagejpeg' ) && $type[2] == 2 ) {
+			$error = __( 'Filetype not supported. Thumbnail not created.' );
 		}
-		elseif (!function_exists('imagepng') && $type[2] == 3) {
-			$error = __('Filetype not supported. Thumbnail not created.');
+		elseif (!function_exists( 'imagepng' ) && $type[2] == 3 ) {
+			$error = __( 'Filetype not supported. Thumbnail not created.' );
 		} else {
 
 			// create the initial copy from the original file
-			if ($type[2] == 1) {
-				$image = imagecreatefromgif($file);
+			if ( $type[2] == 1 ) {
+				$image = imagecreatefromgif( $file );
 			}
-			elseif ($type[2] == 2) {
-				$image = imagecreatefromjpeg($file);
+			elseif ( $type[2] == 2 ) {
+				$image = imagecreatefromjpeg( $file );
 			}
-			elseif ($type[2] == 3) {
-				$image = imagecreatefrompng($file);
+			elseif ( $type[2] == 3 ) {
+				$image = imagecreatefrompng( $file );
 			}
 
-			if (function_exists('imageantialias'))
-				imageantialias($image, TRUE);
+			if ( function_exists( 'imageantialias' ))
+				imageantialias( $image, TRUE );
 
-			$image_attr = getimagesize($file);
+			$image_attr = getimagesize( $file );
 
 			// figure out the longest side
 
-			if ($image_attr[0] > $image_attr[1]) {
+			if ( $image_attr[0] > $image_attr[1] ) {
 				$image_width = $image_attr[0];
 				$image_height = $image_attr[1];
 				$image_new_width = $max_side;
@@ -911,38 +910,38 @@ function wp_create_thumbnail($file, $max_side, $effect = '') {
 				//height > width
 			}
 
-			$thumbnail = imagecreatetruecolor($image_new_width, $image_new_height);
-			@ imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]);
+			$thumbnail = imagecreatetruecolor( $image_new_width, $image_new_height);
+			@ imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1] );
 
 			// If no filters change the filename, we'll do a default transformation.
-			if ( basename($file) == $thumb = apply_filters('thumbnail_filename', basename($file)) )
-				$thumb = preg_replace('!(\.[^.]+)?$!', __('.thumbnail').'$1', basename($file), 1);
+			if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
+				$thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 );
 
-			$thumbpath = str_replace(basename($file), $thumb, $file);
+			$thumbpath = str_replace( basename( $file ), $thumb, $file );
 
 			// move the thumbnail to it's final destination
-			if ($type[2] == 1) {
-				if (!imagegif($thumbnail, $thumbpath)) {
-					$error = __("Thumbnail path invalid");
+			if ( $type[2] == 1 ) {
+				if (!imagegif( $thumbnail, $thumbpath ) ) {
+					$error = __( "Thumbnail path invalid" );
 				}
 			}
-			elseif ($type[2] == 2) {
-				if (!imagejpeg($thumbnail, $thumbpath)) {
-					$error = __("Thumbnail path invalid");
+			elseif ( $type[2] == 2 ) {
+				if (!imagejpeg( $thumbnail, $thumbpath ) ) {
+					$error = __( "Thumbnail path invalid" );
 				}
 			}
-			elseif ($type[2] == 3) {
-				if (!imagepng($thumbnail, $thumbpath)) {
-					$error = __("Thumbnail path invalid");
+			elseif ( $type[2] == 3 ) {
+				if (!imagepng( $thumbnail, $thumbpath ) ) {
+					$error = __( "Thumbnail path invalid" );
 				}
 			}
 
 		}
 	} else {
-		$error = __('File not found');
+		$error = __( 'File not found' );
 	}
 
-	if (!empty ($error)) {
+	if (!empty ( $error ) ) {
 		return $error;
 	} else {
 		apply_filters( 'wp_create_thumbnail', $thumbpath );
@@ -951,21 +950,21 @@ function wp_create_thumbnail($file, $max_side, $effect = '') {
 }
 
 // Some postmeta stuff
-function has_meta($postid) {
+function has_meta( $postid ) {
 	global $wpdb;
 
-	return $wpdb->get_results("
+	return $wpdb->get_results( "
 			SELECT meta_key, meta_value, meta_id, post_id
 			FROM $wpdb->postmeta
 			WHERE post_id = '$postid'
-			ORDER BY meta_key,meta_id", ARRAY_A);
+			ORDER BY meta_key,meta_id", ARRAY_A );
 
 }
 
-function list_meta($meta) {
+function list_meta( $meta ) {
 	global $post_ID;
 	// Exit if no meta
-	if (!$meta) {
+	if (!$meta ) {
 		echo '<tbody id="the-list"><tr style="display: none;"><td>&nbsp;</td></tr></tbody>'; //TBODY needed for list-manipulation JS
 		return;
 	}
@@ -973,26 +972,26 @@ function list_meta($meta) {
 ?>
 	<thead>
 	<tr>
-		<th><?php _e('Key') ?></th>
-		<th><?php _e('Value') ?></th>
-		<th colspan='2'><?php _e('Action') ?></th>
+		<th><?php _e( 'Key' ) ?></th>
+		<th><?php _e( 'Value' ) ?></th>
+		<th colspan='2'><?php _e( 'Action' ) ?></th>
 	</tr>
 	</thead>
 <?php
 	$r ="\n\t<tbody id='the-list'>";
-	foreach ($meta as $entry) {
+	foreach ( $meta as $entry ) {
 		++ $count;
-		if ($count % 2)
+		if ( $count % 2 )
 			$style = 'alternate';
 		else
 			$style = '';
-		if ('_' == $entry['meta_key'] { 0 })
+		if ('_' == $entry['meta_key'] { 0 } )
 			$style .= ' hidden';
 
-		if ( is_serialized($entry['meta_value']) ) {
-			if ( is_serialized_string($entry['meta_value']) ) {
+		if ( is_serialized( $entry['meta_value'] ) ) {
+			if ( is_serialized_string( $entry['meta_value'] ) ) {
 				// this is a serialized string, so we should display it
-				$entry['meta_value'] = maybe_unserialize($entry['meta_value']);
+				$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
 			} else {
 				// this is a serialized array/object so we should NOT display it
 				--$count;
@@ -1000,16 +999,16 @@ function list_meta($meta) {
 			}
 		}
 
-		$key_js = js_escape($entry['meta_key']);
+		$key_js = js_escape( $entry['meta_key'] );
 		$entry['meta_key'] = wp_specialchars( $entry['meta_key'], true );
 		$entry['meta_value'] = wp_specialchars( $entry['meta_value'], true );
 		$r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
 		$r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
 		$r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
-		$r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__('Update')."' /><br />";
+		$r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__( 'Update' )."' /><br />";
 		$r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' onclick=\"return deleteSomething( 'meta', {$entry['meta_id']}, '";
-		$r .= sprintf(__("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), $key_js);
-		$r .= "' );\" class='deletemeta' tabindex='6' value='".__('Delete')."' /></td>";
+		$r .= sprintf( __("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), $key_js );
+		$r .= "' );\" class='deletemeta' tabindex='6' value='".__( 'Delete' )."' /></td>";
 		$r .= "\n\t</tr>";
 	}
 	echo $r;
@@ -1020,45 +1019,45 @@ function list_meta($meta) {
 function get_meta_keys() {
 	global $wpdb;
 
-	$keys = $wpdb->get_col("
+	$keys = $wpdb->get_col( "
 			SELECT meta_key
 			FROM $wpdb->postmeta
 			GROUP BY meta_key
-			ORDER BY meta_key");
+			ORDER BY meta_key" );
 
 	return $keys;
 }
 
 function meta_form() {
 	global $wpdb;
-	$limit = (int) apply_filters('postmeta_form_limit', 30);
-	$keys = $wpdb->get_col("
+	$limit = (int) apply_filters( 'postmeta_form_limit', 30 );
+	$keys = $wpdb->get_col( "
 		SELECT meta_key
 		FROM $wpdb->postmeta
 		GROUP BY meta_key
 		ORDER BY meta_id DESC
-		LIMIT $limit");
-	natcasesort($keys);
+		LIMIT $limit" );
+	natcasesort( $keys );
 ?>
-<h3><?php _e('Add a new custom field:') ?></h3>
+<h3><?php _e( 'Add a new custom field:' ) ?></h3>
 <table id="newmeta" cellspacing="3" cellpadding="3">
 	<tr>
-<th colspan="2"><?php _e('Key') ?></th>
-<th><?php _e('Value') ?></th>
+<th colspan="2"><?php _e( 'Key' ) ?></th>
+<th><?php _e( 'Value' ) ?></th>
 </tr>
 	<tr valign="top">
 		<td align="right" width="18%">
 <?php if ( $keys ) : ?>
 <select id="metakeyselect" name="metakeyselect" tabindex="7">
-<option value="#NONE#"><?php _e('- Select -'); ?></option>
+<option value="#NONE#"><?php _e( '- Select -' ); ?></option>
 <?php
 
 	foreach ( $keys as $key ) {
-		$key = wp_specialchars($key, 1);
+		$key = wp_specialchars( $key, 1 );
 		echo "\n\t<option value='$key'>$key</option>";
 	}
 ?>
-</select> <?php _e('or'); ?>
+</select> <?php _e( 'or' ); ?>
 <?php endif; ?>
 </td>
 <td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
@@ -1066,101 +1065,101 @@ function meta_form() {
 	</tr>
 
 </table>
-<p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e('Add Custom Field &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" /></p>
 <?php
 
 }
 
-function add_meta($post_ID) {
+function add_meta( $post_ID ) {
 	global $wpdb;
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect'])));
-	$metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput'])));
-	$metavalue = maybe_serialize(stripslashes((trim($_POST['metavalue']))));
-	$metavalue = $wpdb->escape($metavalue);
+	$metakeyselect = $wpdb->escape( stripslashes( trim( $_POST['metakeyselect'] ) ) );
+	$metakeyinput = $wpdb->escape( stripslashes( trim( $_POST['metakeyinput'] ) ) );
+	$metavalue = maybe_serialize( stripslashes( (trim( $_POST['metavalue'] ) ) ));
+	$metavalue = $wpdb->escape( $metavalue );
 
-	if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) {
+	if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) {
 		// We have a key/value pair. If both the select and the 
 		// input for the key have data, the input takes precedence:
 
  		if ('#NONE#' != $metakeyselect)
 			$metakey = $metakeyselect;
 
-		if ($metakeyinput)
+		if ( $metakeyinput)
 			$metakey = $metakeyinput; // default
 
-		$result = $wpdb->query("
+		$result = $wpdb->query( "
 						INSERT INTO $wpdb->postmeta 
-						(post_id,meta_key,meta_value) 
-						VALUES ('$post_ID','$metakey','$metavalue')
-					");
+						(post_id,meta_key,meta_value ) 
+						VALUES ('$post_ID','$metakey','$metavalue' )
+					" );
 		return $wpdb->insert_id;
 	}
 	return false;
 } // add_meta
 
-function delete_meta($mid) {
+function delete_meta( $mid ) {
 	global $wpdb;
 	$mid = (int) $mid;
 
-	return $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'");
+	return $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
 }
 
-function update_meta($mid, $mkey, $mvalue) {
+function update_meta( $mid, $mkey, $mvalue ) {
 	global $wpdb;
-	$mvalue = maybe_serialize(stripslashes($mvalue));
-	$mvalue = $wpdb->escape($mvalue);
+	$mvalue = maybe_serialize( stripslashes( $mvalue ));
+	$mvalue = $wpdb->escape( $mvalue );
 	$mid = (int) $mid;
-	return $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'");
+	return $wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'" );
 }
 
-function get_post_meta_by_id($mid) {
+function get_post_meta_by_id( $mid ) {
 	global $wpdb;
 	$mid = (int) $mid;
 
-	$meta = $wpdb->get_row("SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-	if ( is_serialized_string($meta->meta_value) )
-		$meta->meta_value = maybe_unserialize($meta->meta_value);
+	$meta = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
+	if ( is_serialized_string( $meta->meta_value ) )
+		$meta->meta_value = maybe_unserialize( $meta->meta_value );
 	return $meta;
 }
 
-function touch_time($edit = 1, $for_post = 1) {
+function touch_time( $edit = 1, $for_post = 1 ) {
 	global $wp_locale, $post, $comment;
 
 	if ( $for_post )
-		$edit = ( ('draft' == $post->post_status) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date) ) ? false : true;
+		$edit = ( ('draft' == $post->post_status ) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date ) ) ? false : true;
  
-	echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
+	echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__( 'Edit timestamp' ).'</label></legend>';
 
-	$time_adj = time() + (get_option('gmt_offset') * 3600);
+	$time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
 	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
-	$jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
-	$mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj);
-	$aa = ($edit) ? mysql2date('Y', $post_date) : gmdate('Y', $time_adj);
-	$hh = ($edit) ? mysql2date('H', $post_date) : gmdate('H', $time_adj);
-	$mn = ($edit) ? mysql2date('i', $post_date) : gmdate('i', $time_adj);
-	$ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj);
+	$jj = ($edit) ? mysql2date( 'd', $post_date ) : gmdate( 'd', $time_adj );
+	$mm = ($edit) ? mysql2date( 'm', $post_date ) : gmdate( 'm', $time_adj );
+	$aa = ($edit) ? mysql2date( 'Y', $post_date ) : gmdate( 'Y', $time_adj );
+	$hh = ($edit) ? mysql2date( 'H', $post_date ) : gmdate( 'H', $time_adj );
+	$mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj );
+	$ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj );
 
 	echo "<select name=\"mm\" onchange=\"edit_date.checked=true\">\n";
-	for ($i = 1; $i < 13; $i = $i +1) {
+	for ( $i = 1; $i < 13; $i = $i +1 ) {
 		echo "\t\t\t<option value=\"$i\"";
-		if ($i == $mm)
+		if ( $i == $mm )
 			echo ' selected="selected"';
-		echo '>' . $wp_locale->get_month($i) . "</option>\n";
+		echo '>' . $wp_locale->get_month( $i ) . "</option>\n";
 	}
 ?>
 </select>
 <input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" onchange="edit_date.checked=true"/>
-<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @ 
-<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> : 
-<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> 
-<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> 
+<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @
+<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> :
+<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
+<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
 <?php
 	if ( $edit ) {
-		_e('Existing timestamp');
-		//echo ': ' . $wp_locale->get_month($mm) . "$jj, $aa @ $hh:$mn";
-		echo sprintf(__(': %1$s %2$s, %3$s @ %4$s:%5$s'), $wp_locale->get_month($mm), $jj, $aa, $hh, $mn);
+		_e( 'Existing timestamp' );
+		//echo ': ' . $wp_locale->get_month( $mm ) . "$jj, $aa @ $hh:$mn";
+		echo sprintf( __(': %1$s %2$s, %3$s @ %4$s:%5$s' ), $wp_locale->get_month( $mm ), $jj, $aa, $hh, $mn );
 	}
 ?>
 </fieldset>
@@ -1169,50 +1168,50 @@ function touch_time($edit = 1, $for_post = 1) {
 }
 
 // insert_with_markers: Owen Winkler, fixed by Eric Anderson
-// Inserts an array of strings into a file (.htaccess), placing it between
+// Inserts an array of strings into a file (.htaccess ), placing it between
 // BEGIN and END markers.  Replaces existing marked info.  Retains surrounding
 // data.  Creates file if none exists.
 // Returns true on write success, false on failure.
-function insert_with_markers($filename, $marker, $insertion) {
+function insert_with_markers( $filename, $marker, $insertion ) {
 	return true;
-	if (!file_exists($filename) || is_writeable($filename)) {
-		if (!file_exists($filename)) {
+	if (!file_exists( $filename ) || is_writeable( $filename ) ) {
+		if (!file_exists( $filename ) ) {
 			$markerdata = '';
 		} else {
-			$markerdata = explode("\n", implode('', file($filename)));
+			$markerdata = explode( "\n", implode( '', file( $filename ) ) );
 		}
 
-		$f = fopen($filename, 'w');
+		$f = fopen( $filename, 'w' );
 		$foundit = false;
-		if ($markerdata) {
+		if ( $markerdata ) {
 			$state = true;
-			foreach ($markerdata as $n => $markerline) {
-				if (strstr($markerline, "# BEGIN {$marker}"))
+			foreach ( $markerdata as $n => $markerline ) {
+				if ( strstr( $markerline, "# BEGIN {$marker}" ))
 					$state = false;
-				if ($state) {
-					if ( $n + 1 < count($markerdata) )
-						fwrite($f, "{$markerline}\n");
+				if ( $state ) {
+					if ( $n + 1 < count( $markerdata ) )
+						fwrite( $f, "{$markerline}\n" );
 					else
-						fwrite($f, "{$markerline}");
+						fwrite( $f, "{$markerline}" );
 				}
-				if (strstr($markerline, "# END {$marker}")) {
-					fwrite($f, "# BEGIN {$marker}\n");
-					if (is_array($insertion))
-						foreach ($insertion as $insertline)
-							fwrite($f, "{$insertline}\n");
-					fwrite($f, "# END {$marker}\n");
+				if ( strstr( $markerline, "# END {$marker}" ) ) {
+					fwrite( $f, "# BEGIN {$marker}\n" );
+					if ( is_array( $insertion ))
+						foreach ( $insertion as $insertline )
+							fwrite( $f, "{$insertline}\n" );
+					fwrite( $f, "# END {$marker}\n" );
 					$state = true;
 					$foundit = true;
 				}
 			}
 		}
 		if (!$foundit) {
-			fwrite($f, "# BEGIN {$marker}\n");
-			foreach ($insertion as $insertline)
-				fwrite($f, "{$insertline}\n");
-			fwrite($f, "# END {$marker}\n");
+			fwrite( $f, "# BEGIN {$marker}\n" );
+			foreach ( $insertion as $insertline )
+				fwrite( $f, "{$insertline}\n" );
+			fwrite( $f, "# END {$marker}\n" );
 		}
-		fclose($f);
+		fclose( $f );
 		return true;
 	} else {
 		return false;
@@ -1220,24 +1219,24 @@ function insert_with_markers($filename, $marker, $insertion) {
 }
 
 // extract_from_markers: Owen Winkler
-// Returns an array of strings from a file (.htaccess) from between BEGIN
+// Returns an array of strings from a file (.htaccess ) from between BEGIN
 // and END markers.
-function extract_from_markers($filename, $marker) {
+function extract_from_markers( $filename, $marker ) {
 	$result = array ();
 
-	if (!file_exists($filename)) {
+	if (!file_exists( $filename ) ) {
 		return $result;
 	}
 
-	if ($markerdata = explode("\n", implode('', file($filename))));
+	if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
 	{
 		$state = false;
-		foreach ($markerdata as $markerline) {
-			if (strstr($markerline, "# END {$marker}"))
+		foreach ( $markerdata as $markerline ) {
+			if ( strstr( $markerline, "# END {$marker}" ))
 				$state = false;
-			if ($state)
+			if ( $state )
 				$result[] = $markerline;
-			if (strstr($markerline, "# BEGIN {$marker}"))
+			if ( strstr( $markerline, "# BEGIN {$marker}" ))
 				$state = true;
 		}
 	}
@@ -1252,8 +1251,8 @@ function got_mod_rewrite() {
 	if ( !$is_apache )
 		return false;
 
-	if ( function_exists('apache_get_modules') ) {
-		if ( !in_array('mod_rewrite', apache_get_modules()) )
+	if ( function_exists( 'apache_get_modules' ) ) {
+		if ( !in_array( 'mod_rewrite', apache_get_modules() ) )
 			return false;
 	}
 
@@ -1264,17 +1263,17 @@ function save_mod_rewrite_rules() {
 	global $is_apache, $wp_rewrite;
 	$home_path = get_home_path();
 
-	if (!$wp_rewrite->using_mod_rewrite_permalinks())
+	if (!$wp_rewrite->using_mod_rewrite_permalinks() )
 		return;
 
-	if (!((!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')))
+	if (!((!file_exists( $home_path.'.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path.'.htaccess' ) ) )
 		return;
 
-	if (! got_mod_rewrite())
+	if (! got_mod_rewrite() )
 		return;
 
-	$rules = explode("\n", $wp_rewrite->mod_rewrite_rules());
-	insert_with_markers($home_path.'.htaccess', 'WordPress', $rules);
+	$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
+	insert_with_markers( $home_path.'.htaccess', 'WordPress', $rules );
 }
 
 function get_broken_themes() {
@@ -1290,17 +1289,17 @@ function get_page_templates() {
 	$templates = $themes[$theme]['Template Files'];
 	$page_templates = array ();
 
-	if (is_array($templates)) {
-		foreach ($templates as $template) {
-			$template_data = implode('', file(ABSPATH.$template));
-			preg_match("|Template Name:(.*)|i", $template_data, $name);
-			preg_match("|Description:(.*)|i", $template_data, $description);
+	if ( is_array( $templates ) ) {
+		foreach ( $templates as $template ) {
+			$template_data = implode( '', file( ABSPATH.$template ));
+			preg_match( "|Template Name:(.* )|i", $template_data, $name );
+			preg_match( "|Description:(.* )|i", $template_data, $description );
 
 			$name = $name[1];
 			$description = $description[1];
 
-			if (!empty ($name)) {
-				$page_templates[trim($name)] = basename($template);
+			if (!empty ( $name ) ) {
+				$page_templates[trim( $name )] = basename( $template );
 			}
 		}
 	}
@@ -1308,10 +1307,10 @@ function get_page_templates() {
 	return $page_templates;
 }
 
-function page_template_dropdown($default = '') {
+function page_template_dropdown( $default = '' ) {
 	$templates = get_page_templates();
-	foreach (array_keys($templates) as $template)
-		: if ($default == $templates[$template])
+	foreach (array_keys( $templates ) as $template )
+		: if ( $default == $templates[$template] )
 			$selected = " selected='selected'";
 		else
 			$selected = '';
@@ -1319,26 +1318,26 @@ function page_template_dropdown($default = '') {
 	endforeach;
 }
 
-function parent_dropdown($default = 0, $parent = 0, $level = 0) {
+function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
 	global $wpdb, $post_ID;
-	$items = $wpdb->get_results("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_type = 'page' ORDER BY menu_order");
+	$items = $wpdb->get_results( "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_type = 'page' ORDER BY menu_order" );
 
-	if ($items) {
-		foreach ($items as $item) {
+	if ( $items ) {
+		foreach ( $items as $item ) {
 			// A page cannot be it's own parent.
-			if (!empty ($post_ID)) {
-				if ($item->ID == $post_ID) {
+			if (!empty ( $post_ID ) ) {
+				if ( $item->ID == $post_ID ) {
 					continue;
 				}
 			}
-			$pad = str_repeat('&nbsp;', $level * 3);
-			if ($item->ID == $default)
+			$pad = str_repeat( '&nbsp;', $level * 3 );
+			if ( $item->ID == $default)
 				$current = ' selected="selected"';
 			else
 				$current = '';
 
 			echo "\n\t<option value='$item->ID'$current>$pad $item->post_title</option>";
-			parent_dropdown($default, $item->ID, $level +1);
+			parent_dropdown( $default, $item->ID, $level +1 );
 		}
 	} else {
 		return false;
@@ -1354,37 +1353,38 @@ function user_can_access_admin_page() {
 	global $plugin_page;
 
 	$parent = get_admin_page_parent();
-	/*echo "pa: $parent pn: $pagenow pp: $plugin_page<br/>";
-	echo "<pre>";
-	print_r($_wp_menu_nopriv);
-	print_r($_wp_submenu_nopriv);
-	echo "</pre>";*/
-	if ( isset($_wp_submenu_nopriv[$parent][$pagenow]) )
+
+	if ( isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
 		return false;
 
-	if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$plugin_page]) )
+	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
 		return false;
 	
-	if ( empty($parent) ) {
-		if ( isset($_wp_menu_nopriv[$pagenow]) )
+	if ( empty( $parent) ) {
+		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
 			return false;
-		if ( isset($_wp_submenu_nopriv[$pagenow][$pagenow]) )
+		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
 			return false;
-		if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) )
+		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
 			return false;
-		foreach (array_keys($_wp_submenu_nopriv) as $key) {
-			if ( isset($_wp_submenu_nopriv[$key][$pagenow]) )
+		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
+			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
 				return false;
-			if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]) )
+			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
 			return false;	
 		}
 		return true;
 	}
 
-	if (isset ($submenu[$parent])) {
-		foreach ($submenu[$parent] as $submenu_array) {
-			if ($submenu_array[2] == $pagenow) {
-				if (current_user_can($submenu_array[1]))
+	if ( isset( $submenu[$parent] ) ) {
+		foreach ( $submenu[$parent] as $submenu_array ) {
+			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
+				if ( current_user_can( $submenu_array[1] ))
+					return true;
+				else
+					return false;
+			} else if ( $submenu_array[2] == $pagenow ) {
+				if ( current_user_can( $submenu_array[1] ))
 					return true;
 				else
 					return false;
@@ -1392,15 +1392,15 @@ function user_can_access_admin_page() {
 		}
 	}
 
-	foreach ($menu as $menu_array) {
-		if ($menu_array[2] == $parent) {
-			if (current_user_can($menu_array[1]))
+	foreach ( $menu as $menu_array ) {
+		if ( $menu_array[2] == $parent) {
+			if ( current_user_can( $menu_array[1] ))
 				return true;
 			else
 				return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -1411,44 +1411,55 @@ function get_admin_page_title() {
 	global $pagenow;
 	global $plugin_page;
 
-	if (isset ($title) && !empty ($title)) {
+	if ( isset( $title ) && !empty ( $title ) ) {
 		return $title;
 	}
 
-	$hook = get_plugin_page_hook($plugin_page, $pagenow);
+	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
 
 	$parent = $parent1 = get_admin_page_parent();
-	if (empty ($parent)) {
-		foreach ($menu as $menu_array) {
-			if (isset ($menu_array[3])) {
-				if ($menu_array[2] == $pagenow) {
+	if ( empty ( $parent) ) {
+		foreach ( $menu as $menu_array ) {
+			if ( isset( $menu_array[3] ) ) {
+				if ( $menu_array[2] == $pagenow ) {
 					$title = $menu_array[3];
 					return $menu_array[3];
 				} else
-					if (isset ($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) {
+					if ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
 						$title = $menu_array[3];
 						return $menu_array[3];
 					}
+			} else {
+				$title = $menu_array[0];
+				return $title;
 			}
 		}
 	} else {
-		foreach (array_keys($submenu) as $parent) {
-			foreach ($submenu[$parent] as $submenu_array) {
-				if (isset ($submenu_array[3])) {
-					if ($submenu_array[2] == $pagenow) {
+		foreach (array_keys( $submenu ) as $parent) {
+			foreach ( $submenu[$parent] as $submenu_array ) {
+				if ( isset( $plugin_page ) && 
+					($plugin_page == $submenu_array[2] ) && 
+					(($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) )
+					) {
 						$title = $submenu_array[3];
 						return $submenu_array[3];
-					} else
-						if (isset ($plugin_page) && ($plugin_page == $submenu_array[2]) && (($parent == $pagenow) || ($parent == $plugin_page) || ($plugin_page == $hook) || (($pagenow == 'admin.php') && ($parent1 != $submenu_array[2])))) {
-							$title = $submenu_array[3];
-							return $submenu_array[3];
-						}
+					}
+
+				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+					continue;
+
+				if ( isset( $submenu_array[3] ) ) {
+					$title = $submenu_array[3];
+					return $submenu_array[3];
+				} else {
+					$title = $submenu_array[0];
+					return $title;
 				}
 			}
 		}
 	}
 
-	return '';
+	return $title;
 }
 
 function get_admin_page_parent() {
@@ -1461,46 +1472,46 @@ function get_admin_page_parent() {
 	global $_wp_menu_nopriv;
 	global $_wp_submenu_nopriv;
 
-	if ( !empty ($parent_file) ) {
-		if ( isset($_wp_real_parent_file[$parent_file]) )
+	if ( !empty ( $parent_file ) ) {
+		if ( isset( $_wp_real_parent_file[$parent_file] ) )
 			$parent_file = $_wp_real_parent_file[$parent_file];
 
 		return $parent_file;
 	}
 
-	if ($pagenow == 'admin.php' && isset ($plugin_page)) {
-		foreach ($menu as $parent_menu) {
-			if ($parent_menu[2] == $plugin_page) {
+	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
+		foreach ( $menu as $parent_menu ) {
+			if ( $parent_menu[2] == $plugin_page ) {
 				$parent_file = $plugin_page;
-				if ( isset($_wp_real_parent_file[$parent_file]) )
+				if ( isset( $_wp_real_parent_file[$parent_file] ) )
 					$parent_file = $_wp_real_parent_file[$parent_file];
 				return $parent_file;
 			}
 		}
-		if ( isset($_wp_menu_nopriv[$plugin_page]) ) {
+		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
 			$parent_file = $plugin_page;
-			if ( isset($_wp_real_parent_file[$parent_file]) )
+			if ( isset( $_wp_real_parent_file[$parent_file] ) )
 					$parent_file = $_wp_real_parent_file[$parent_file];
 			return $parent_file;
 		}			
 	}
 
-	if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) ) {
+	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
 		$parent_file = $pagenow;
-		if ( isset($_wp_real_parent_file[$parent_file]) )
+		if ( isset( $_wp_real_parent_file[$parent_file] ) )
 			$parent_file = $_wp_real_parent_file[$parent_file];
 		return $parent_file;		
 	}
 
-	foreach (array_keys($submenu) as $parent) {
-		foreach ($submenu[$parent] as $submenu_array) {
-			if ( isset($_wp_real_parent_file[$parent]) )
+	foreach (array_keys( $submenu ) as $parent) {
+		foreach ( $submenu[$parent] as $submenu_array ) {
+			if ( isset( $_wp_real_parent_file[$parent] ) )
 				$parent = $_wp_real_parent_file[$parent];
-			if ($submenu_array[2] == $pagenow) {
+			if ( $submenu_array[2] == $pagenow ) {
 				$parent_file = $parent;
 				return $parent;
 			} else
-				if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) {
+				if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
 					$parent_file = $parent;
 					return $parent;
 				}
@@ -1511,36 +1522,36 @@ function get_admin_page_parent() {
 	return '';
 }
 
-function add_menu_page($page_title, $menu_title, $access_level, $file, $function = '') {
+function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
 	global $menu, $admin_page_hooks;
 
-	$file = plugin_basename($file);
+	$file = plugin_basename( $file );
 
-	$menu[] = array ($menu_title, $access_level, $file, $page_title);
+	$menu[] = array ( $menu_title, $access_level, $file, $page_title );
 
-	$admin_page_hooks[$file] = sanitize_title($menu_title);
+	$admin_page_hooks[$file] = sanitize_title( $menu_title );
 
-	$hookname = get_plugin_page_hookname($file, '');
-	if (!empty ($function) && !empty ($hookname))
-		add_action($hookname, $function);
+	$hookname = get_plugin_page_hookname( $file, '' );
+	if (!empty ( $function ) && !empty ( $hookname ))
+		add_action( $hookname, $function );
 
 	return $hookname;
 }
 
-function add_submenu_page($parent, $page_title, $menu_title, $access_level, $file, $function = '') {
+function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function = '' ) {
 	global $submenu;
 	global $menu;
 	global $_wp_real_parent_file;
 	global $_wp_submenu_nopriv;
 	global $_wp_menu_nopriv;
 
-	$file = plugin_basename($file);
+	$file = plugin_basename( $file );
 
-	$parent = plugin_basename($parent);
-	if ( isset($_wp_real_parent_file[$parent]) )
+	$parent = plugin_basename( $parent);
+	if ( isset( $_wp_real_parent_file[$parent] ) )
 		$parent = $_wp_real_parent_file[$parent];
 
-	if ( !current_user_can($access_level) ) {
+	if ( !current_user_can( $access_level ) ) {
 		$_wp_submenu_nopriv[$parent][$file] = true;
 		return false;
 	}
@@ -1549,75 +1560,74 @@ function add_submenu_page($parent, $page_title, $menu_title, $access_level, $fil
 	// as the first item in the submenu.  If the submenu file is the same as the
 	// parent file someone is trying to link back to the parent manually.  In
 	// this case, don't automatically add a link back to avoid duplication.
-	if (!isset ($submenu[$parent]) && $file != $parent  ) {
-		foreach ($menu as $parent_menu) {
-			if ( $parent_menu[2] == $parent && current_user_can($parent_menu[1]) ) {
+	if (!isset( $submenu[$parent] ) && $file != $parent  ) {
+		foreach ( $menu as $parent_menu ) {
+			if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) )
 				$submenu[$parent][] = $parent_menu;
-			}
 		}
 	}
 
-	$submenu[$parent][] = array ($menu_title, $access_level, $file, $page_title);
+	$submenu[$parent][] = array ( $menu_title, $access_level, $file, $page_title );
 
-	$hookname = get_plugin_page_hookname($file, $parent);
-	if (!empty ($function) && !empty ($hookname))
-		add_action($hookname, $function);
+	$hookname = get_plugin_page_hookname( $file, $parent);
+	if (!empty ( $function ) && !empty ( $hookname ))
+		add_action( $hookname, $function );
 
 	return $hookname;
 }
 
-function add_options_page($page_title, $menu_title, $access_level, $file, $function = '') {
-	return add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file, $function);
+function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
+	return add_submenu_page( 'options-general.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
-function add_management_page($page_title, $menu_title, $access_level, $file, $function = '') {
-	return add_submenu_page('edit.php', $page_title, $menu_title, $access_level, $file, $function);
+function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
+	return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
-function add_theme_page($page_title, $menu_title, $access_level, $file, $function = '') {
-	return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function);
+function add_theme_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
+	return add_submenu_page( 'themes.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
-function validate_file($file, $allowed_files = '') {
-	if (false !== strpos($file, './'))
+function validate_file( $file, $allowed_files = '' ) {
+	if ( false !== strpos( $file, './' ))
 		return 1;
 
-	if (':' == substr($file, 1, 1))
+	if (':' == substr( $file, 1, 1 ))
 		return 2;
 
-	if (!empty ($allowed_files) && (!in_array($file, $allowed_files)))
+	if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
 		return 3;
 
 	return 0;
 }
 
-function validate_file_to_edit($file, $allowed_files = '') {
-	$file = stripslashes($file);
+function validate_file_to_edit( $file, $allowed_files = '' ) {
+	$file = stripslashes( $file );
 
-	$code = validate_file($file, $allowed_files);
+	$code = validate_file( $file, $allowed_files );
 
-	if (!$code)
+	if (!$code )
 		return $file;
 
-	switch ($code) {
+	switch ( $code ) {
 		case 1 :
-			wp_die(__('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.'));
+			wp_die( __('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.' ));
 
 		case 2 :
-			wp_die(__('Sorry, can&#8217;t call files with their real path.'));
+			wp_die( __('Sorry, can&#8217;t call files with their real path.' ));
 
 		case 3 :
-			wp_die(__('Sorry, that file cannot be edited.'));
+			wp_die( __('Sorry, that file cannot be edited.' ));
 	}
 }
 
 function get_home_path() {
-	$home = get_option('home');
-	if ($home != '' && $home != get_option('siteurl')) {
-		$home_path = parse_url($home);
+	$home = get_option( 'home' );
+	if ( $home != '' && $home != get_option( 'siteurl' ) ) {
+		$home_path = parse_url( $home );
 		$home_path = $home_path['path'];
-		$root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]);
-		$home_path = trailingslashit($root.$home_path);
+		$root = str_replace( $_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"] );
+		$home_path = trailingslashit( $root.$home_path );
 	} else {
 		$home_path = ABSPATH;
 	}
@@ -1625,8 +1635,8 @@ function get_home_path() {
 	return $home_path;
 }
 
-function get_real_file_to_edit($file) {
-	if ('index.php' == $file || '.htaccess' == $file) {
+function get_real_file_to_edit( $file ) {
+	if ('index.php' == $file || '.htaccess' == $file ) {
 		$real_file = get_home_path().$file;
 	} else {
 		$real_file = ABSPATH.$file;
@@ -1635,74 +1645,74 @@ function get_real_file_to_edit($file) {
 	return $real_file;
 }
 
-$wp_file_descriptions = array ('index.php' => __('Main Index Template'), 'style.css' => __('Stylesheet'), 'comments.php' => __('Comments'), 'comments-popup.php' => __('Popup Comments'), 'footer.php' => __('Footer'), 'header.php' => __('Header'), 'sidebar.php' => __('Sidebar'), 'archive.php' => __('Archives'), 'category.php' => __('Category Template'), 'page.php' => __('Page Template'), 'search.php' => __('Search Results'), 'single.php' => __('Single Post'), '404.php' => __('404 Template'), 'my-hacks.php' => __('my-hacks.php (legacy hacks support)'), '.htaccess' => __('.htaccess (for rewrite rules)'),
+$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ),
 	// Deprecated files
-	'wp-layout.css' => __('Stylesheet'), 'wp-comments.php' => __('Comments Template'), 'wp-comments-popup.php' => __('Popup Comments Template'));
+	'wp-layout.css' => __( 'Stylesheet' ), 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' ));
 
-function get_file_description($file) {
+function get_file_description( $file ) {
 	global $wp_file_descriptions;
 
-	if (isset ($wp_file_descriptions[basename($file)])) {
-		return $wp_file_descriptions[basename($file)];
+	if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
+		return $wp_file_descriptions[basename( $file )];
 	}
 	elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) {
-		$template_data = implode('', file( ABSPATH . $file ));
-		if (preg_match("|Template Name:(.*)|i", $template_data, $name))
+		$template_data = implode( '', file( ABSPATH . $file ) );
+		if ( preg_match( "|Template Name:(.* )|i", $template_data, $name ))
 			return $name[1];
 	}
 
-	return basename($file);
+	return basename( $file );
 }
 
-function update_recently_edited($file) {
-	$oldfiles = (array) get_option('recently_edited');
-	if ($oldfiles) {
-		$oldfiles = array_reverse($oldfiles);
+function update_recently_edited( $file ) {
+	$oldfiles = (array ) get_option( 'recently_edited' );
+	if ( $oldfiles ) {
+		$oldfiles = array_reverse( $oldfiles );
 		$oldfiles[] = $file;
-		$oldfiles = array_reverse($oldfiles);
-		$oldfiles = array_unique($oldfiles);
-		if (5 < count($oldfiles))
-			array_pop($oldfiles);
+		$oldfiles = array_reverse( $oldfiles );
+		$oldfiles = array_unique( $oldfiles );
+		if ( 5 < count( $oldfiles ))
+			array_pop( $oldfiles );
 	} else {
 		$oldfiles[] = $file;
 	}
-	update_option('recently_edited', $oldfiles);
+	update_option( 'recently_edited', $oldfiles );
 }
 
-function get_plugin_data($plugin_file) {
-	$plugin_data = implode('', file($plugin_file));
-	preg_match("|Plugin Name:(.*)|i", $plugin_data, $plugin_name);
-	preg_match("|Plugin URI:(.*)|i", $plugin_data, $plugin_uri);
-	preg_match("|Description:(.*)|i", $plugin_data, $description);
-	preg_match("|Author:(.*)|i", $plugin_data, $author_name);
-	preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri);
-	if (preg_match("|Version:(.*)|i", $plugin_data, $version))
-		$version = trim($version[1]);
+function get_plugin_data( $plugin_file ) {
+	$plugin_data = implode( '', file( $plugin_file ));
+	preg_match( "|Plugin Name:(.*)|i", $plugin_data, $plugin_name );
+	preg_match( "|Plugin URI:(.*)|i", $plugin_data, $plugin_uri );
+	preg_match( "|Description:(.*)|i", $plugin_data, $description );
+	preg_match( "|Author:(.*)|i", $plugin_data, $author_name );
+	preg_match( "|Author URI:(.*)|i", $plugin_data, $author_uri );
+	if ( preg_match( "|Version:(.*)|i", $plugin_data, $version ))
+		$version = trim( $version[1] );
 	else
 		$version = '';
 
-	$description = wptexturize(trim($description[1]));
+	$description = wptexturize( trim( $description[1] ));
 
 	$name = $plugin_name[1];
-	$name = trim($name);
+	$name = trim( $name );
 	$plugin = $name;
-	if ('' != $plugin_uri[1] && '' != $name) {
-		$plugin = '<a href="' . trim($plugin_uri[1]) . '" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>';
+	if ('' != $plugin_uri[1] && '' != $name ) {
+		$plugin = '<a href="' . trim( $plugin_uri[1] ) . '" title="'.__( 'Visit plugin homepage' ).'">'.$plugin.'</a>';
 	}
 
-	if ('' == $author_uri[1]) {
-		$author = trim($author_name[1]);
+	if ('' == $author_uri[1] ) {
+		$author = trim( $author_name[1] );
 	} else {
-		$author = '<a href="' . trim($author_uri[1]) . '" title="'.__('Visit author homepage').'">' . trim($author_name[1]) . '</a>';
+		$author = '<a href="' . trim( $author_uri[1] ) . '" title="'.__( 'Visit author homepage' ).'">' . trim( $author_name[1] ) . '</a>';
 	}
 
-	return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);
+	return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1] );
 }
 
 function get_plugins() {
 	global $wp_plugins;
 
-	if (isset ($wp_plugins)) {
+	if ( isset( $wp_plugins ) ) {
 		return $wp_plugins;
 	}
 
@@ -1710,23 +1720,23 @@ function get_plugins() {
 	$plugin_root = ABSPATH . PLUGINDIR;
 
 	// Files in wp-content/plugins directory
-	$plugins_dir = @ dir($plugin_root);
-	if ($plugins_dir) {
-		while (($file = $plugins_dir->read()) !== false) {
-			if (preg_match('|^\.+$|', $file))
+	$plugins_dir = @ dir( $plugin_root);
+	if ( $plugins_dir ) {
+		while (($file = $plugins_dir->read() ) !== false ) {
+			if ( preg_match( '|^\.+$|', $file ))
 				continue;
-			if (is_dir($plugin_root.'/'.$file)) {
-				$plugins_subdir = @ dir($plugin_root.'/'.$file);
-				if ($plugins_subdir) {
-					while (($subfile = $plugins_subdir->read()) !== false) {
-						if (preg_match('|^\.+$|', $subfile))
+			if ( is_dir( $plugin_root.'/'.$file ) ) {
+				$plugins_subdir = @ dir( $plugin_root.'/'.$file );
+				if ( $plugins_subdir ) {
+					while (($subfile = $plugins_subdir->read() ) !== false ) {
+						if ( preg_match( '|^\.+$|', $subfile ))
 							continue;
-						if (preg_match('|\.php$|', $subfile))
+						if ( preg_match( '|\.php$|', $subfile ))
 							$plugin_files[] = "$file/$subfile";
 					}
 				}
 			} else {
-				if (preg_match('|\.php$|', $file))
+				if ( preg_match( '|\.php$|', $file ))
 					$plugin_files[] = $file;
 			}
 		}
@@ -1736,72 +1746,72 @@ function get_plugins() {
 		return $wp_plugins;
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable("$plugin_root/$plugin_file") )
+		if ( !is_readable( "$plugin_root/$plugin_file" ) )
 			continue;
 
-		$plugin_data = get_plugin_data("$plugin_root/$plugin_file");
+		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file" );
 
-		if ( empty ($plugin_data['Name']) )
+		if ( empty ( $plugin_data['Name'] ) )
 			continue;
 
-		$wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
+		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
 	}
 
-	uasort($wp_plugins, create_function('$a, $b', 'return strnatcasecmp($a["Name"], $b["Name"]);'));
+	uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' ));
 
 	return $wp_plugins;
 }
 
-function get_plugin_page_hookname($plugin_page, $parent_page) {
+function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 	global $admin_page_hooks;
 
 	$parent = get_admin_page_parent();
 
-	if (empty ($parent_page) || 'admin.php' == $parent_page) {
-		if (isset ($admin_page_hooks[$plugin_page]))
+	if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
+		if ( isset( $admin_page_hooks[$plugin_page] ))
 			$page_type = 'toplevel';
 		else
-			if (isset ($admin_page_hooks[$parent]))
+			if ( isset( $admin_page_hooks[$parent] ))
 				$page_type = $admin_page_hooks[$parent];
 	} else
-		if (isset ($admin_page_hooks[$parent_page])) {
+		if ( isset( $admin_page_hooks[$parent_page] ) ) {
 			$page_type = $admin_page_hooks[$parent_page];
 		} else {
 			$page_type = 'admin';
 		}
 
-	$plugin_name = preg_replace('!\.php!', '', $plugin_page);
+	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
 
 	return $page_type.'_page_'.$plugin_name;
 }
 
-function get_plugin_page_hook($plugin_page, $parent_page) {
+function get_plugin_page_hook( $plugin_page, $parent_page ) {
 	global $wp_filter;
 
-	$hook = get_plugin_page_hookname($plugin_page, $parent_page);
-	if (isset ($wp_filter[$hook]))
+	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
+	if ( isset( $wp_filter[$hook] ))
 		return $hook;
 	else
 		return '';
 }
 
 function browse_happy() {
-	$getit = __('WordPress recommends a better browser');
+	$getit = __( 'WordPress recommends a better browser' );
 	echo '
 		<p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
 		';
 }
-if (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE'))
-	add_action('admin_footer', 'browse_happy');
+if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ))
+	add_action( 'admin_footer', 'browse_happy' );
 
-function documentation_link($for) {
+function documentation_link( $for ) {
 	return;
 }
 
-function register_importer($id, $name, $description, $callback) {
+function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
 
-	$wp_importers[$id] = array ($name, $description, $callback);
+	$wp_importers[$id] = array ( $name, $description, $callback );
 }
 
 function get_importers() {
@@ -1830,14 +1840,14 @@ function current_theme_info() {
 
 // array wp_handle_upload ( array &file [, array overrides] )
 // file: reference to a single element of $_FILES. Call the function once for each uploaded file.
-// overrides: an associative array of names=>values to override default variables with extract($overrides, EXTR_OVERWRITE).
+// overrides: an associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
 // On success, returns an associative array of file attributes.
-// On failure, returns $overrides['upload_error_handler'](&$file, $message) or array('error'=>$message).
-function wp_handle_upload(&$file, $overrides = false) {
+// On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
+function wp_handle_upload( &$file, $overrides = false ) {
 	// The default error handler.
-	if (! function_exists('wp_handle_upload_error') ) {
-		function wp_handle_upload_error(&$file, $message) {
-			return array('error'=>$message);
+	if (! function_exists( 'wp_handle_upload_error' ) ) {
+		function wp_handle_upload_error( &$file, $message ) {
+			return array( 'error'=>$message );
 		}
 	}
 
@@ -1848,13 +1858,13 @@ function wp_handle_upload(&$file, $overrides = false) {
 	$action = 'wp_handle_upload';
 
 	// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
-	$upload_error_strings = array(false,
-		__("The uploaded file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>."),
-		__("The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form."),
-		__("The uploaded file was only partially uploaded."),
-		__("No file was uploaded."),
-		__("Missing a temporary folder."),
-		__("Failed to write file to disk."));
+	$upload_error_strings = array( false,
+		__( "The uploaded file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>." ),
+		__( "The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ),
+		__( "The uploaded file was only partially uploaded." ),
+		__( "No file was uploaded." ),
+		__( "Missing a temporary folder." ),
+		__( "Failed to write file to disk." ));
 
 	// All tests are on by default. Most can be turned off by $override[{test_name}] = false;
 	$test_form = true;
@@ -1864,93 +1874,93 @@ function wp_handle_upload(&$file, $overrides = false) {
 	$test_type = true;
 
 	// Install user overrides. Did we mention that this voids your warranty?
-	if ( is_array($overrides) )
-		extract($overrides, EXTR_OVERWRITE);
+	if ( is_array( $overrides ) )
+		extract( $overrides, EXTR_OVERWRITE );
 
 	// A correct form post will pass this test.
-	if ( $test_form && (!isset($_POST['action']) || ($_POST['action'] != $action)) )
-		return $upload_error_handler($file, __('Invalid form submission.'));
+	if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) )
+		return $upload_error_handler( $file, __( 'Invalid form submission.' ));
 
 	// A successful upload will pass this test. It makes no sense to override this one.
 	if ( $file['error'] > 0 )
-		return $upload_error_handler($file, $upload_error_strings[$file['error']]);
+		return $upload_error_handler( $file, $upload_error_strings[$file['error']] );
 
 	// A non-empty file will pass this test.
-	if ( $test_size && !($file['size'] > 0) )
-		return $upload_error_handler($file, __('File is empty. Please upload something more substantial.'));
+	if ( $test_size && !($file['size'] > 0 ) )
+		return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial.' ));
 
 	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	if (! @ is_uploaded_file($file['tmp_name']) )
-		return $upload_error_handler($file, __('Specified file failed upload test.'));
+	if (! @ is_uploaded_file( $file['tmp_name'] ) )
+		return $upload_error_handler( $file, __( 'Specified file failed upload test.' ));
 
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
 	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype($file['name'], $mimes);
+		$wp_filetype = wp_check_filetype( $file['name'], $mimes );
 
-		extract($wp_filetype);
+		extract( $wp_filetype );
 
 		if ( !$type || !$ext )
-			return $upload_error_handler($file, __('File type does not meet security guidelines. Try another.'));
+			return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' ));
 	}
 
-	// A writable uploads dir will pass this test. Override with $uploads = array('path'=>$path, 'url'=>$url);
-	if ( ( empty( $uploads['path'] ) || empty( $uploads['url'] ) ) && ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-		return $upload_error_handler($file, $uploads['error']);
+	// A writable uploads dir will pass this test. Again, there's no point overriding this one.
+	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
+		return $upload_error_handler( $file, $uploads['error'] );
 
 	// Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
-	if ( isset($unique_filename_callback) && function_exists($unique_filename_callback) ) {
-		$filename = $unique_filename_callback($uploads['path'], $file['name']);
+	if ( isset( $unique_filename_callback ) && function_exists( $unique_filename_callback ) ) {
+		$filename = $unique_filename_callback( $uploads['path'], $file['name'] );
 	} else {
 		$number = '';
-		$filename = str_replace('#', '_', $file['name']);
-		$filename = str_replace(array('\\', "'"), '', $filename);
-		if ( empty($ext) )
+		$filename = str_replace( '#', '_', $file['name'] );
+		$filename = str_replace( array( '\\', "'" ), '', $filename );
+		if ( empty( $ext) )
 			$ext = '';
 		else
 			$ext = ".$ext";
-		while ( file_exists($uploads['path'] . "/$filename") ) {
+		while ( file_exists( $uploads['path'] . "/$filename" ) ) {
 			if ( '' == "$number$ext" )
 				$filename = $filename . ++$number . $ext;
 			else
-				$filename = str_replace("$number$ext", ++$number . $ext, $filename);
+				$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
 		}
-		$filename = str_replace($ext, '', $filename);
-		$filename = sanitize_title_with_dashes($filename) . $ext;
+		$filename = str_replace( $ext, '', $filename );
+		$filename = sanitize_title_with_dashes( $filename ) . $ext;
 	}
 
 	// Move the file to the uploads dir
 	$new_file = $uploads['path'] . "/$filename";
-	if ( false === @ move_uploaded_file($file['tmp_name'], $new_file) )
-		wp_die(printf(__('The uploaded file could not be moved to %s.'), $uploads['path']));
+	if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) )
+		wp_die( printf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ));
 
 	// Set correct file permissions
-	$stat = stat(dirname($new_file));
+	$stat = stat( dirname( $new_file ));
 	$perms = $stat['mode'] & 0000666;
-	@ chmod($new_file, $perms);
+	@ chmod( $new_file, $perms );
 
 	// Compute the URL
 	$url = $uploads['url'] . "/$filename";
 	
-	$return = apply_filters( 'wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $type) );
+	$return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
 
 	return $return;
 }
 
-function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) {
+function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
 	if ( $height <= $hmax && $width <= $wmax )
-		return array($width, $height);
+		return array( $width, $height);
 	elseif ( $width / $height > $wmax / $hmax )
-		return array($wmax, (int) ($height / $width * $wmax));
+		return array( $wmax, (int) ($height / $width * $wmax ));
 	else
-		return array((int) ($width / $height * $hmax), $hmax);
+		return array( (int) ($width / $height * $hmax ), $hmax );
 }
 
-function wp_import_cleanup($id) {
-	wp_delete_attachment($id);
+function wp_import_cleanup( $id ) {
+	wp_delete_attachment( $id );
 }
 
-function wp_import_upload_form($action) {
-	$size = strtolower( ini_get('upload_max_filesize') );
+function wp_import_upload_form( $action ) {
+	$size = strtolower( ini_get( 'upload_max_filesize' ) );
 	$bytes = 0;
 	if ( strstr( $size, 'k' ) )
 		$bytes = $size * 1024;
@@ -1961,79 +1971,78 @@ function wp_import_upload_form($action) {
 ?>
 <form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo $action ?>">
 <p>
-<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf( __('Maximum size: %s'), $size ); ?>)
+<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?> )
 <input type="file" id="upload" name="import" size="25" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
 <p class="submit">
-<input type="submit" value="<?php _e('Upload file and import'); ?> &raquo;" />
+<input type="submit" value="<?php _e( 'Upload file and import' ); ?> &raquo;" />
 </p>
 </form>
 <?php
 }
 
 function wp_import_handle_upload() {
-	$overrides = array('test_form' => false, 'test_type' => false);
-	$file = wp_handle_upload($_FILES['import'], $overrides);
+	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$file = wp_handle_upload( $_FILES['import'], $overrides );
 
-	if ( isset($file['error']) )
+	if ( isset( $file['error'] ) )
 		return $file;
 
 	$url = $file['url'];
 	$file = addslashes( $file['file'] );
-	$filename = basename($file);
+	$filename = basename( $file );
 
 	// Construct the object array
-	$object = array(
-		'post_title' => $filename,
+	$object = array( 'post_title' => $filename,
 		'post_content' => $url,
 		'post_mime_type' => 'import',
 		'guid' => $url
 	);
 
 	// Save the data
-	$id = wp_insert_attachment($object, $file);
+	$id = wp_insert_attachment( $object, $file );
 
-	return array('file' => $file, 'id' => $id);
+	return array( 'file' => $file, 'id' => $id );
 }
 
-function the_attachment_links($id = false) {
+function the_attachment_links( $id = false ) {
 	$id = (int) $id;
-	$post = & get_post($id);
+	$post = & get_post( $id );
 
 	if ( $post->post_type != 'attachment' )
 		return false;
 
-	$icon = get_attachment_icon($post->ID);
+	$icon = get_attachment_icon( $post->ID );
 	$attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
-	$thumb = isset($attachment_data['thumb']);
+	$thumb = isset( $attachment_data['thumb'] );
 ?>
 <form id="the-attachment-links">
 <table>
 	<col />
 	<col class="widefat" />
 	<tr>
-		<th scope="row"><?php _e('URL') ?></th>
+		<th scope="row"><?php _e( 'URL' ) ?></th>
 		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo $post->guid ?></textarea></td>
 	</tr>
 <?php if ( $icon ) : ?>
 	<tr>
-		<th scope="row"><?php $thumb ? _e('Thumbnail linked to file') : _e('Image linked to file'); ?></th>
+		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to file' ) : _e( 'Image linked to file' ); ?></th>
 		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid; ?>"><?php echo $icon ?></a></textarea></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php $thumb ? _e('Thumbnail linked to page') : _e('Image linked to file'); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
+		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to page' ) : _e( 'Image linked to file' ); ?></th>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
 	</tr>
 <?php else : ?>
 	<tr>
-		<th scope="row"><?php _e('Link to file') ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid);  ?></a></textarea></td>
+		<th scope="row"><?php _e( 'Link to file' ) ?></th>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename( $post->guid );  ?></a></textarea></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e('Link to page') ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
+		<th scope="row"><?php _e( 'Link to page' ) ?></th>
+		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
 	</tr>
 <?php endif; ?>
 </table>
@@ -2041,23 +2050,23 @@ function the_attachment_links($id = false) {
 <?php
 }
 
-function get_udims($width, $height) {
+function get_udims( $width, $height) {
 	if ( $height <= 96 && $width <= 128 )
-		return array($width, $height);
+		return array( $width, $height);
 	elseif ( $width / $height > 4 / 3 )
-		return array(128, (int) ($height / $width * 128));
+		return array( 128, (int) ($height / $width * 128 ));
 	else
-		return array((int) ($width / $height * 96), 96);
+		return array( (int) ($width / $height * 96 ), 96 );
 }
 
-function wp_reset_vars($vars) {
-	for ($i=0; $i<count($vars); $i += 1) {
+function wp_reset_vars( $vars ) {
+	for ( $i=0; $i<count( $vars ); $i += 1 ) {
 		$var = $vars[$i];
 		global $$var;
 
-		if (!isset($$var)) {
-			if (empty($_POST["$var"])) {
-				if (empty($_GET["$var"]))
+		if (!isset( $$var ) ) {
+			if ( empty( $_POST["$var"] ) ) {
+				if ( empty( $_GET["$var"] ) )
 					$$var = '';
 				else
 					$$var = $_GET["$var"];
@@ -2069,10 +2078,10 @@ function wp_reset_vars($vars) {
 }
 
 // If siteurl or home changed, reset cookies and flush rewrite rules.
-function update_home_siteurl($old_value, $value) {
+function update_home_siteurl( $old_value, $value ) {
 	global $wp_rewrite, $user_login, $user_pass_md5;
 
-	if ( defined("WP_INSTALLING") )
+	if ( defined( "WP_INSTALLING" ) )
 		return;
 
 	// If home changed, write rewrite rules to new location.
@@ -2080,11 +2089,58 @@ function update_home_siteurl($old_value, $value) {
 	// Clear cookies for old paths.
 	wp_clearcookie();
 	// Set cookies for new paths.
-	wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl'));	
+	wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));	
+}
+
+add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
+add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
+
+function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+	if ( ctype_digit( $src_file ) ) // Handle int as attachment ID
+		$src_file = get_attached_file( $src_file );
+
+	$src = wp_load_image( $src_file );
+
+	if ( !is_resource( $src ))
+		return $src;
+
+	$dst = imagecreatetruecolor( $dst_w, $dst_h );
+
+	if ( $src_abs ) {
+		$src_w -= $src_x;
+		$src_h -= $src_y;
+	}
+
+	imageantialias( $dst, true );
+	imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+
+	if ( !$dst_file )
+		$dst_file = str_replace( basename( $src_file ), 'cropped-'.basename( $src_file ), $src_file );
+
+	$dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
+
+	if ( imagejpeg( $dst, $dst_file ) )
+		return $dst_file;
+	else
+		return false;
 }
 
-add_action('update_option_home', 'update_home_siteurl', 10, 2);
-add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+function wp_load_image( $file ) {
+	if ( ctype_digit( $file ) )
+		$file = get_attached_file( $file );
+
+	if ( !file_exists( $file ) )
+		return "File '$file' doesn't exist?";
+
+	$contents = file_get_contents( $file );
+
+	$image = imagecreatefromstring( $contents );
+
+	if ( !is_resource( $image ) )
+		return "File '$file' is not image?";
+
+	return $image;
+}
 
 function autocomplete_css() {
 	?>
@@ -2163,52 +2219,4 @@ The Webmaster" );
 }			
 
 add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
-
-function wp_crop_image($src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) {
-	if ( ctype_digit($src_file) ) // Handle int as attachment ID
-		$src_file = get_attached_file($src_file);
-
-	$src = wp_load_image($src_file);
-
-	if ( !is_resource($src) )
-		return $src;
-
-	$dst = imagecreatetruecolor($dst_w, $dst_h);
-
-	if ( $src_abs ) {
-		$src_w -= $src_x;
-		$src_h -= $src_y;
-	}
-
-	imageantialias($dst, true);
-	imagecopyresampled($dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-
-	if ( !$dst_file )
-		$dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file);
-
-	$dst_file = preg_replace('/\\.[^\\.]+$/', '.jpg', $dst_file);
-
-	if ( imagejpeg($dst, $dst_file) )
-		return $dst_file;
-	else
-		return false;
-}
-
-function wp_load_image($file) {
-	if ( ctype_digit($file) )
-		$file = get_attached_file($file);
-
-	if ( !file_exists($file) )
-		return "File '$file' doesn't exist?";
-
-	$contents = file_get_contents($file);
-
-	$image = imagecreatefromstring($contents);
-
-	if ( !is_resource($image) )
-		return "File '$file' is not image?";
-
-	return $image;
-}
-
 ?>
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 663efa9..30afb3a 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -16,7 +16,7 @@ get_admin_page_title();
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 <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>
+<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $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" />
diff --git a/wp-admin/bookmarklet.php b/wp-admin/bookmarklet.php
index 417d910..def516e 100644
--- a/wp-admin/bookmarklet.php
+++ b/wp-admin/bookmarklet.php
@@ -35,16 +35,16 @@ if (!empty($post_title))
 else
 	$post->post_title = $popuptitle;
 
-  
+
 $content  = wp_specialchars($_REQUEST['content']);
 $popupurl = wp_specialchars($_REQUEST['popupurl']);
-    if ( !empty($content) ) {
-        $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
-    } else {
-        $post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
-    }
+if ( !empty($content) ) {
+	$post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
+} else {
+	$post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
+}
 
-    /* /big funky fixes */
+/* /big funky fixes */
 
 ?><!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">
@@ -77,15 +77,15 @@ $popupurl = wp_specialchars($_REQUEST['popupurl']);
 }
 
 #wpbookmarklet .wrap {
-    border: 0px;
+	border: 0px;
 }
 
 #wpbookmarklet #postdiv {
-    margin-bottom: 0.5em;
+	margin-bottom: 0.5em;
 }
 
 #wpbookmarklet #titlediv {
-    margin-bottom: 1em;
+	margin-bottom: 1em;
 }
 
 -->
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 58c0188..0bdd68f 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -20,6 +20,7 @@ case 'addcat':
 	} else {
 		wp_redirect('categories.php?message=4#addcat');
 	}
+	exit;
 break;
 
 case 'delete':
@@ -36,20 +37,21 @@ case 'delete':
 		wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
     if ( $cat_ID == get_option('default_link_category') )
-		wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
+		wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for links"), $cat_name));
 
 	wp_delete_category($cat_ID);
 
 	wp_redirect('categories.php?message=2');
+	exit;
 
 break;
 
 case 'edit':
 
-    require_once ('admin-header.php');
-    $cat_ID = (int) $_GET['cat_ID'];
-    $category = get_category_to_edit($cat_ID);
-    include('edit-category-form.php');
+	require_once ('admin-header.php');
+	$cat_ID = (int) $_GET['cat_ID'];
+	$category = get_category_to_edit($cat_ID);
+	include('edit-category-form.php');
 
 break;
 
@@ -60,9 +62,12 @@ case 'editedcat':
 	if ( !current_user_can('manage_categories') )
 		wp_die(__('Cheatin&#8217; uh?'));
 
-	wp_update_category($_POST);
+	if ( wp_update_category($_POST) )
+		wp_redirect('categories.php?message=3'); 
+	else
+		wp_redirect('categories.php?message=5'); 
 
-	wp_redirect('categories.php?message=3');
+	exit;
 break;
 
 default:
@@ -74,6 +79,7 @@ $messages[1] = __('Category added.');
 $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
+$messages[5] = __('Category not updated.');
 ?>
 
 <?php if (isset($_GET['message'])) : ?>
@@ -93,7 +99,7 @@ $messages[4] = __('Category not added.');
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
         <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
-        <th scope="col" width="90" style="text-align: center"><?php _e('Bookmarks') ?></th>
+        <th scope="col" width="90" style="text-align: center"><?php _e('Links') ?></th>
         <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
 	</tr>
 	</thead>
@@ -108,8 +114,7 @@ cat_rows();
 
 <?php if ( current_user_can('manage_categories') ) : ?>
 <div class="wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and bookmarks in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
-<p><?php _e('<strong>Also Note:</strong><br />Categories will appear on your blog once you have posted something in them. Empty categories remain invisible.'); ?></p>
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
 </div>
 
 <?php include('edit-category-form.php'); ?>
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index 065bd39..8ce3cd8 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -202,7 +202,7 @@ case 'editedcomment':
 	$location = ( empty($_POST['referredby']) ? "edit.php?p=$comment_post_ID&c=1" : $_POST['referredby'] ) . '#comment-' . $comment_ID;
 	$location = apply_filters('comment_edit_redirect', $location, $comment_ID);
 	wp_redirect($location);
-
+	exit();
 	break;
 default:
 	break;
diff --git a/wp-admin/custom-fields.js b/wp-admin/custom-fields.js
index a48661f..ad7a2db 100644
--- a/wp-admin/custom-fields.js
+++ b/wp-admin/custom-fields.js
@@ -14,10 +14,10 @@ function customFieldsAddIn() {
 	for ( var i=0; i < inputs.length; i++ ) {
 		if ('text' == inputs[i].type) {
 			inputs[i].setAttribute('autocomplete', 'off');
-		        inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
+			inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
 		}
 		if ('updatemeta' == inputs[i].className) {
-		        inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
+			inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
 		}
 	}
 
diff --git a/wp-admin/dbx-admin-key-js.php b/wp-admin/dbx-admin-key-js.php
index f47e53b..9746a8c 100644
--- a/wp-admin/dbx-admin-key-js.php
+++ b/wp-admin/dbx-admin-key-js.php
@@ -9,7 +9,7 @@ switch ( $_GET['pagenow'] ) :
 		break;
 	case 'page.php' :
 	case 'page-new.php' :
-		$man = 'pagemeta'; 
+		$man = 'pagemeta';
 		break;
 	case 'link.php' :
 		$man = 'linkmeta';
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index 66581ae..fece01f 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -40,5 +40,6 @@ if ( ! empty($cat_ID) ) {
 <?php autocomplete_textbox( "wpmu-edit.php?action=searchcategories&search=", "cat_name", "searchresults" ); ?>
 <p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
 <div id="ajax-response"></div>
+<?php do_action('edit_category_form', $category); ?>
 </form>
 </div>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 6227ef7..488a055 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Edit Comments');
-$parent_file = 'edit.php';
+$parent_file = 'edit-comments.php';
 wp_enqueue_script( 'admin-comments' );
 
 require_once('admin-header.php');
@@ -85,19 +85,57 @@ if (isset($_GET['s'])) {
 		comment_approved != 'spam'
 		ORDER BY comment_date DESC");
 } else {
-	if ( isset($_GET['offset']) )
-		$offset = (int) $_GET['offset'] * 20;
+	if ( isset( $_GET['apage'] ) )
+		$page = (int) $_GET['apage'];
 	else
-		$offset = 0;
+		$page = 1;
+	$start = $offset = ( $page - 1 ) * 20;
+	$end = $start + 20;
 
-	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $offset,20");
+	$comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $start, $end" );
+	$total = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1'" );
 }
+?>
+<?php if ( $total > 20 ) {
+$total_pages = ceil( $total / 20 );
+$r = '';
+if ( 1 < $page ) {
+	$args['apage'] = ( 1 == $page - 1 ) ? FALSE : $page - 1;
+	$r .=  '<a class="prev" href="' . add_query_arg( $args ) . '">&laquo; '. __('Previous Page') .'</a>' . "\n";
+}
+if ( ( $total_pages = ceil( $total / 20 ) ) > 1 ) {
+	for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
+		if ( $page == $page_num ) :
+			$r .=  "<span>$page_num</span>\n";
+		else :
+			$p = false;
+			if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
+				$args['apage'] = ( 1 == $page_num ) ? FALSE : $page_num;
+				$r .= '<a class="page-numbers" href="' . add_query_arg($args) . '">' . ( $page_num ) . "</a>\n";
+				$in = true;
+			elseif ( $in == true ) :
+				$r .= "...\n";
+				$in = false;
+			endif;
+		endif;
+	endfor;
+}
+if ( ( $page ) * 20 < $total || -1 == $total ) {
+	$args['apage'] = $page + 1;
+	$r .=  '<a class="next" href="' . add_query_arg($args) . '">'. __('Next Page') .' &raquo;</a>' . "\n";
+}
+echo "<p>$r</p>";
+?>
+
+<?php } ?>
+
+<?php
 if ('view' == $mode) {
 	if ($comments) {
-		if ($offset)
-			$start = " start='$offset'";
-		else
-			$start = '';
+?>
+<?php
+$offset = $offset + 1;
+$start = " start='$offset'";
 
 		echo "<ol id='the-comment-list' class='commentlist' $start>";
 		$i = 0;
@@ -105,7 +143,7 @@ if ('view' == $mode) {
 		++$i; $class = '';
 		$authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
 			$comment_status = wp_get_comment_status($comment->comment_ID);
-			if ('unapproved' == $comment_status) 
+			if ('unapproved' == $comment_status)
 				$class .= ' unapproved';
 			if ($i % 2)
 				$class .= ' alternate';
@@ -115,7 +153,7 @@ if ('view' == $mode) {
 
 <?php comment_text() ?>
 
-<p><?php comment_date('M j, g:i A');  ?> &#8212; [ 
+<p><?php comment_date('M j, g:i A');  ?> &#8212; [
 <?php
 if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
 	echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
@@ -143,7 +181,7 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
 
 		?>
 		<p>
-        <strong><?php _e('No comments found.') ?></strong></p>
+			<strong><?php _e('No comments found.') ?></strong></p>
 
 		<?php
 	} // end if ($comments)
@@ -205,6 +243,38 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
 	} // end if ($comments)
 }
 	?>
+<?php if ( $total > 20 ) {
+$total_pages = ceil( $total / 20 );
+$r = '';
+if ( 1 < $page ) {
+	$args['apage'] = ( 1 == $page - 1 ) ? FALSE : $page - 1;
+	$r .=  '<a class="prev" href="' . add_query_arg( $args ) . '">&laquo; '. __('Previous Page') .'</a>' . "\n";
+}
+if ( ( $total_pages = ceil( $total / 20 ) ) > 1 ) {
+	for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
+		if ( $page == $page_num ) :
+			$r .=  "<span>$page_num</span>\n";
+		else :
+			$p = false;
+			if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
+				$args['apage'] = ( 1 == $page_num ) ? FALSE : $page_num;
+				$r .= '<a class="page-numbers" href="' . add_query_arg($args) . '">' . ( $page_num ) . "</a>\n";
+				$in = true;
+			elseif ( $in == true ) :
+				$r .= "...\n";
+				$in = false;
+			endif;
+		endif;
+	endfor;
+}
+if ( ( $page ) * 20 < $total || -1 == $total ) {
+	$args['apage'] = $page + 1;
+	$r .=  '<a class="next" href="' . add_query_arg($args) . '">'. __('Next Page') .' &raquo;</a>' . "\n";
+}
+echo "<p>$r</p>";
+?>
+
+<?php } ?>
 
 </div>
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index c761b67..2b18d8e 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -8,8 +8,7 @@ $messages[3] = __('Custom field deleted.');
 <?php endif; ?>
 
 <form name="post" action="post.php" method="post" id="post">
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) || 
-            isset($_GET['popupurl']) ): ?>
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
 
@@ -126,7 +125,7 @@ if ( $authors && count( $authors ) > 1 ) :
 <h3 class="dbx-handle"><?php _e('Post Author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
-<?php 
+<?php
 foreach ($authors as $o) :
 $o = get_userdata( $o->ID );
 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
@@ -145,8 +144,8 @@ endforeach;
 </div>
 
 <fieldset id="titlediv">
-  <legend><?php _e('Title') ?></legend> 
-  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
+	<legend><?php _e('Title') ?></legend>
+	<div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
 </fieldset>
 
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
@@ -213,7 +212,7 @@ if (current_user_can('upload_files')) {
 </div>
 <div class="dbx-content-wrapper">
 <div class="dbx-content"><?php _e('Send trackbacks to'); ?>: <?php echo $form_trackback; ?> (<?php _e('Separate multiple URIs with spaces'); ?>)
-<?php 
+<?php
 if ( ! empty($pings) )
 	echo $pings;
 ?>
@@ -232,7 +231,7 @@ if ( ! empty($pings) )
 <table cellpadding="3">
 <?php
 $metadata = has_meta($post_ID);
-list_meta($metadata); 
+list_meta($metadata);
 ?>
 
 </table>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 893e3f7..ac20ed7 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -54,8 +54,8 @@ addLoadEvent(focusit);
 	<tr>
 		<th scope="row" valign="top"><?php _e('Comment Status') ?>:</th>
 		<td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment->comment_approved, '1'); ?> /> <?php _e('Approved') ?></label><br />
-	  <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> /> <?php _e('Moderated') ?></label><br />
-	  <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
+		<label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> /> <?php _e('Moderated') ?></label><br />
+		<label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
 	</tr>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 2d1cef6..d907a62 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -54,17 +54,17 @@ edCanvas = document.getElementById('content');
 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
 	<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
 
-<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" /> 
-  <input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
+<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />
+	<input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
 
 	 <?php if ( current_user_can('edit_posts') ) : ?>
-  <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" /> 
+	<input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" />
 <?php endif; ?>
 
 <?php if ('bookmarklet' != $mode) {
-      echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
-  } ?>
-  <input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" />
+		echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
+	} ?>
+	<input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" />
 </p>
 
 <?php do_action('simple_edit_form', ''); ?>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index ac9c831..4c0a714 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -30,7 +30,7 @@ function xfn_check($class, $value = '', $type = 'check') {
 }

 ?>

 

-<div class="wrap"> 

+<div class="wrap">

 <h2><?php echo $heading ?></h2>

 <?php echo $form ?>

 <?php wp_nonce_field($nonce_action); ?>

@@ -53,7 +53,7 @@ function xfn_check($class, $value = '', $type = 'check') {
 </fieldset>

 

 <fieldset class="dbx-box">

-<h3 class="dbx-handle"><?php _e('Target') ?></h3> 

+<h3 class="dbx-handle"><?php _e('Target') ?></h3>

 <div class="dbx-content">

 <label for="link_target_blank" class="selectit">

 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />

@@ -68,7 +68,7 @@ function xfn_check($class, $value = '', $type = 'check') {
 </fieldset>

 

 <fieldset class="dbx-box">

-<h3 class="dbx-handle"><?php _e('Visible') ?></h3> 

+<h3 class="dbx-handle"><?php _e('Visible') ?></h3>

 <div class="dbx-content">

 <label for="link_visible_yes" class="selectit">

 <input id="link_visible_yes" type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index ae52683..5f80f26 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -16,7 +16,7 @@ if (0 == $post_ID) {
 $sendto = wp_get_referer();
 
 if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
- 	$sendto = 'redo';
+	$sendto = 'redo';
 $sendto = wp_specialchars( $sendto );
 
 ?>
@@ -27,7 +27,7 @@ $sendto = wp_specialchars( $sendto );
 wp_nonce_field($nonce_action);
 
 if (isset($mode) && 'bookmarklet' == $mode) {
-    echo '<input type="hidden" name="mode" value="bookmarklet" />';
+	echo '<input type="hidden" name="mode" value="bookmarklet" />';
 }
 ?>
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
@@ -103,7 +103,7 @@ addLoadEvent(focusit);
 <h3 class="dbx-handle"><?php _e('Page Author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
-<?php 
+<?php
 foreach ($authors as $o) :
 $o = get_userdata( $o->ID );
 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
@@ -117,7 +117,7 @@ endforeach;
 <?php endif; ?>
 
 <fieldset id="pageorder" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Order') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page Order') ?></h3>
 <div class="dbx-content"><p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p></div>
 </fieldset>
 
@@ -168,9 +168,9 @@ if (current_user_can('upload_files')) {
 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
 <div id="postcustomstuff" class="dbx-content">
 <table cellpadding="3">
-<?php 
+<?php
 $metadata = has_meta($post_ID);
-list_meta($metadata); 
+list_meta($metadata);
 ?>
 
 </table>
@@ -186,7 +186,7 @@ list_meta($metadata);
 </div>
 
 <?php if ('edit' == $action) :
-	$delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID ); 
+	$delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID );
 	if ( current_user_can('delete_page', $post->ID) ) ?>
 		<input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"if ( confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
 <?php endif; ?>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 721d5df..ca496ab 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -10,12 +10,12 @@ require_once('admin-header.php');
 <h2><?php _e('Page Management'); ?></h2>
 <p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page &raquo;'); ?></a></p>
 
-<form name="searchform" action="" method="get"> 
-  <fieldset> 
-  <legend><?php _e('Search Pages&hellip;') ?></legend>
-  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" /> 
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
-  </fieldset>
+<form name="searchform" action="" method="get">
+	<fieldset>
+	<legend><?php _e('Search Pages&hellip;') ?></legend>
+	<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" />
+	<input type="submit" name="submit" value="<?php _e('Search') ?>"  />
+	</fieldset>
 </form>
 
 <?php
@@ -53,10 +53,10 @@ page_rows(0, 0, $posts, $all);
 <p><?php _e('No pages yet.') ?></p>
 <?php
 } // end if ($posts)
-?> 
+?>
 
 <h3><a href="page-new.php"><?php _e('Create New Page &raquo;'); ?></a></h3>
 
 </div>
 
-<?php include('admin-footer.php'); ?> 
+<?php include('admin-footer.php'); ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index e96b6d0..395bc6b 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -12,11 +12,11 @@ $drafts = get_users_drafts( $user_ID );
 $other_drafts = get_others_drafts( $user_ID);
 
 if ($drafts || $other_drafts) {
-?> 
+?>
 <div class="wrap">
 <?php if ($drafts) { ?>
-    <p><strong><?php _e('Your Drafts:') ?></strong> 
-    <?php
+	<p><strong><?php _e('Your Drafts:') ?></strong>
+	<?php
 	$i = 0;
 	foreach ($drafts as $draft) {
 		if (0 != $i)
@@ -27,13 +27,13 @@ if ($drafts || $other_drafts) {
 		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
 		++$i;
 		}
-	?> 
-    .</p> 
+	?>
+	.</p>
 <?php } ?>
 
-<?php if ($other_drafts) { ?> 
-    <p><strong><?php _e('Other&#8217;s Drafts:') ?></strong> 
-    <?php
+<?php if ($other_drafts) { ?>
+	<p><strong><?php _e('Other&#8217;s Drafts:') ?></strong>
+	<?php
 	$i = 0;
 	foreach ($other_drafts as $draft) {
 		if (0 != $i)
@@ -44,8 +44,8 @@ if ($drafts || $other_drafts) {
 		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
 		++$i;
 		}
-	?> 
-    .</p> 
+	?>
+	.</p>
 
 <?php } ?>
 
@@ -88,7 +88,7 @@ if ( count($arc_result) ) { ?>
 <form name="viewarc" id="viewarc" action="" method="get">
 	<fieldset>
 	<legend><?php _e('Browse Month&hellip;') ?></legend>
-    <select name='m'>
+	<select name='m'>
 	<?php
 		foreach ($arc_result as $arc_row) {
 			if ( $arc_row->yyear == 0 )
@@ -127,12 +127,12 @@ if ( count($arc_result) ) { ?>
 <?php
 // define the columns to display, the syntax is 'internal name' => 'display name'
 $posts_columns = array(
-  'id'         => __('ID'),
-  'date'       => __('When'),
-  'title'      => __('Title'),
-  'categories' => __('Categories'),
-  'comments'   => __('Comments'),
-  'author'     => __('Author')
+	'id'         => __('ID'),
+	'date'       => __('When'),
+	'title'      => __('Title'),
+	'categories' => __('Categories'),
+	'comments'   => __('Comments'),
+	'author'     => __('Author')
 );
 $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
@@ -143,7 +143,7 @@ $posts_columns['control_delete'] = '';
 
 ?>
 
-<table class="widefat"> 
+<table class="widefat">
 	<thead>
 	<tr>
 
@@ -157,10 +157,10 @@ $posts_columns['control_delete'] = '';
 <?php
 if ($posts) {
 $bgcolor = '';
-foreach ($posts as $post) { start_wp();
+while (have_posts()) : the_post();
 add_filter('the_title','wp_specialchars');
 $class = ('alternate' == $class) ? '' : 'alternate';
-?> 
+?>
 	<tr id='post-<?php echo $id; ?>' class='<?php echo $class; ?>'>
 
 <?php
@@ -177,7 +177,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'date':
 		?>
-		<td><?php the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td>
+		<td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td>
 		<?php
 		break;
 	case 'title':
@@ -195,9 +195,9 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'comments':
 		?>
-		<td style="text-align: center"><a href="edit.php?p=<?php echo $id ?>&amp;c=1"> 
-      <?php comments_number(__('0'), __('1'), __('%')) ?> 
-      </a></td>
+		<td style="text-align: center"><a href="edit.php?p=<?php echo $id ?>&amp;c=1">
+			<?php comments_number(__('0'), __('1'), __('%')) ?>
+			</a></td>
 		<?php
 		break;
 
@@ -235,7 +235,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 ?>
 	</tr> 
 <?php
-}
+endwhile;
 } else {
 ?>
   <tr style='background-color: <?php echo $bgcolor; ?>'> 
@@ -259,9 +259,9 @@ if ( 1 == count($posts) ) {
 
 	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
 	if ($comments) {
-	?> 
-<h3 id="comments"><?php _e('Comments') ?></h3> 
-<ol id="the-comment-list" class="commentlist"> 
+	?>
+<h3 id="comments"><?php _e('Comments') ?></h3>
+<ol id="the-comment-list" class="commentlist">
 <?php
 $i = 0;
 foreach ($comments as $comment) {
@@ -269,7 +269,7 @@ foreach ($comments as $comment) {
 		++$i; $class = '';
 		$authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
 			$comment_status = wp_get_comment_status($comment->comment_ID);
-			if ('unapproved' == $comment_status) 
+			if ('unapproved' == $comment_status)
 				$class .= ' unapproved';
 			if ($i % 2)
 				$class .= ' alternate';
@@ -299,8 +299,8 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
 	echo '</ol>';
 	}//end if comments
 	?>
-<?php } ?> 
-</div> 
-<?php 
+<?php } ?>
+</div>
+<?php
  include('admin-footer.php');
-?> 
+?>
diff --git a/wp-admin/export.php b/wp-admin/export.php
index f50b8e0..8f740fc 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -15,6 +15,25 @@ require_once ('admin-header.php');
 <p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>

 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>

 <form action="" method="get">

+<h3><?php _e('Optional options'); ?></h3>

+

+<table>

+<tr>

+<th><?php _e('Restrict Author:'); ?></th>

+<td>

+<select name="author">

+<option value="all" selected="selected"><?php _e('All'); ?></option>

+<?php

+$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );  

+foreach ( $authors as $id ) {

+	$o = get_userdata( $id );

+	echo "<option value='$o->ID'>$o->display_name</option>";

+}

+?>

+</select>

+</td>

+</tr>

+</table>

 <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />

 <input type="hidden" name="download" value="true" />

 </p>

@@ -26,17 +45,35 @@ require_once ('admin-header.php');
 <?php

 

 function export_wp() {

-	global $wpdb, $posts, $post;

-	$filename = 'wordpress.' . date('Y-m-d') . '.xml';

+global $wpdb, $posts, $post;

+

+$filename = 'wordpress.' . date('Y-m-d') . '.xml';

+

 header('Content-Description: File Transfer');

 header('Content-Type: application/octet-stream');

 header("Content-Disposition: attachment; filename=$filename");

-header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);

-//$posts = query_posts('');

-$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC");

+header('Content-type: text/wxr+xml; charset=' . get_option('blog_charset'), true);

+

+$where = '';

+if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {

+	$author_id = (int) $_GET['author'];

+	$where = " WHERE post_author = '$author_id' ";

+}

+

+$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");

 ?>

+<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->

+<!-- It contains information about your blog's posts, comments, and categories. -->

+<!-- You may use this file to transfer that content from one site to another. -->

+<!-- To import this information into a WordPress blog, -->

+<!-- 1. Log into that blog as an administrator -->

+<!-- 2. Go to Manage: Import in the blog's admin panels -->

+<!-- 3. Choose "WordPress" from the list -->

+<!-- 4. Upload this file using the form provided on that page -->

+<!-- You will be taken through the simple import procedure. -->

+

 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->

-<rss version="2.0" 

+<rss version="2.0"

 	xmlns:content="http://purl.org/rss/1.0/modules/content/"

 	xmlns:wfw="http://wellformedweb.org/CommentAPI/"

 	xmlns:dc="http://purl.org/dc/elements/1.1/"

@@ -62,6 +99,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A
 <guid isPermaLink="false"><?php the_guid(); ?></guid>

 <description></description>

 <content:encoded><![CDATA[<?php echo $post->post_content ?>]]></content:encoded>

+<wp:post_id><?php echo $post->ID; ?></wp:post_id>

 <wp:post_date><?php echo $post->post_date; ?></wp:post_date>

 <wp:post_date_gmt><?php echo $post->post_date_gmt; ?></wp:post_date_gmt>

 <wp:comment_status><?php echo $post->comment_status; ?></wp:comment_status>

@@ -71,7 +109,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A
 <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>

 <wp:post_type><?php echo $post->post_type; ?></wp:post_type>

 <?php

-$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); 

+$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");

 if ( $postmeta ) {

 ?>

 <?php foreach( $postmeta as $meta ) { ?>

@@ -82,9 +120,10 @@ if ( $postmeta ) {
 <?php } ?>

 <?php } ?>

 <?php

-$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); 

+$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID");

 if ( $comments ) { foreach ( $comments as $c ) { ?>

 <wp:comment>

+<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>

 <wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author>

 <wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email>

 <wp:comment_author_url><?php echo $c->comment_author_url; ?></wp:comment_author_url>

diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index c7c41d3..d7df5ad 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -525,7 +525,7 @@ class Blogger_Import {
 				$did_one = true;

 			}

 			$output.= "<p>$archivename $status</p>\n";

- 		}

+		}

 		if ( ! $did_one )

 			$this->set_next_step(7);

 		die( $this->refresher(1000) . $output );

diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php
index 780e45d..2cbf75f 100644
--- a/wp-admin/import/blogware.php
+++ b/wp-admin/import/blogware.php
@@ -20,7 +20,7 @@ class BW_Import {
 		$trans_tbl = array_flip($trans_tbl);

 		return strtr($string, $trans_tbl);

 	}

-	

+

 	function greet() {

 		echo '<div class="narrow">';

 		echo '<p>'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog.  Pick a Blogware file to upload and click Import.').'</p>';

@@ -30,7 +30,7 @@ class BW_Import {
 

 	function import_posts() {

 		global $wpdb, $current_user;

-		

+

 		set_magic_quotes_runtime(0);

 		$importdata = file($this->file); // Read the file into an array

 		$importdata = implode('', $importdata); // squish it

@@ -39,7 +39,7 @@ class BW_Import {
 		preg_match_all('|(<item[^>]+>(.*?)</item>)|is', $importdata, $posts);

 		$posts = $posts[1];

 		unset($importdata);

-		echo '<ol>';		

+		echo '<ol>';

 		foreach ($posts as $post) {

 			flush();

 			preg_match('|<item type=\"(.*?)\">|is', $post, $post_type);

@@ -102,7 +102,7 @@ class BW_Import {
 

 			preg_match_all('|<comment>(.*?)</comment>|is', $post, $comments);

 			$comments = $comments[1];

-			

+

 			if ( $comments ) {

 				$comment_post_ID = $post_id;

 				$num_comments = 0;

@@ -157,7 +157,7 @@ class BW_Import {
 		$this->file = $file['file'];

 		$this->import_posts();

 		wp_import_cleanup($file['id']);

-		

+

 		echo '<h3>';

 		printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));

 		echo '</h3>';

@@ -170,7 +170,7 @@ class BW_Import {
 			$step = (int) $_GET['step'];

 

 		$this->header();

-		

+

 		switch ($step) {

 			case 0 :

 				$this->greet();

@@ -179,12 +179,12 @@ class BW_Import {
 				$this->import();

 				break;

 		}

-		

+

 		$this->footer();

 	}

 

 	function BW_Import() {

-		// Nothing.	

+		// Nothing.

 	}

 }

 

diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index 026d871..02c030f 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -9,7 +9,7 @@
 **/
 if(!function_exists('get_catbynicename'))
 {
-	function get_catbynicename($category_nicename) 
+	function get_catbynicename($category_nicename)
 	{
 	global $wpdb;
 
@@ -60,57 +60,58 @@ if(!function_exists('link_exists'))
 //
 //    This cries out for a C-implementation to be included in PHP core
 //
-   function valid_1byte($char) {
-       if(!is_int($char)) return false;
-       return ($char & 0x80) == 0x00;
-   }
-  
-   function valid_2byte($char) {
-       if(!is_int($char)) return false;
-       return ($char & 0xE0) == 0xC0;
-   }
-
-   function valid_3byte($char) {
-       if(!is_int($char)) return false;
-       return ($char & 0xF0) == 0xE0;
-   }
-
-   function valid_4byte($char) {
-       if(!is_int($char)) return false;
-       return ($char & 0xF8) == 0xF0;
-   }
-  
-   function valid_nextbyte($char) {
-       if(!is_int($char)) return false;
-       return ($char & 0xC0) == 0x80;
-   }
-  
-   function valid_utf8($string) {
-       $len = strlen($string);
-       $i = 0;   
-       while( $i < $len ) {
-           $char = ord(substr($string, $i++, 1));
-           if(valid_1byte($char)) {    // continue
-               continue;
-           } else if(valid_2byte($char)) { // check 1 byte
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-           } else if(valid_3byte($char)) { // check 2 bytes
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-           } else if(valid_4byte($char)) { // check 3 bytes
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-               if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-                   return false;
-           } // goto next char
-       }
-       return true; // done
-   }
+
+function valid_1byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0x80) == 0x00;
+}
+
+function valid_2byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xE0) == 0xC0;
+}
+
+function valid_3byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xF0) == 0xE0;
+}
+
+function valid_4byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xF8) == 0xF0;
+}
+
+function valid_nextbyte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xC0) == 0x80;
+}
+
+function valid_utf8($string) {
+	$len = strlen($string);
+	$i = 0;
+	while( $i < $len ) {
+		$char = ord(substr($string, $i++, 1));
+		if(valid_1byte($char)) {    // continue
+			continue;
+		} else if(valid_2byte($char)) { // check 1 byte
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+		} else if(valid_3byte($char)) { // check 2 bytes
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+		} else if(valid_4byte($char)) { // check 3 bytes
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
+				return false;
+		} // goto next char
+	}
+	return true; // done
+}
 
 function csc ($s) {
 	if (valid_utf8 ($s)) {
@@ -151,7 +152,7 @@ class Dotclear_Import {
 		echo '</form></div>';
 	}
 
-	function get_dc_cats() 
+	function get_dc_cats()
 	{
 		global $wpdb;
 		// General Housekeeping
@@ -186,7 +187,7 @@ class Dotclear_Import {
 		// Get Posts
 		return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name
 						FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie
-						  ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A);
+						ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A);
 	}
 
 	function get_dc_comments()
@@ -211,7 +212,7 @@ class Dotclear_Import {
 		return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A);
 	}
 
-	function cat2wp($categories='') 
+	function cat2wp($categories='')
 	{
 		// General Housekeeping
 		global $wpdb;
@@ -221,7 +222,7 @@ class Dotclear_Import {
 		if(is_array($categories))
 		{
 			echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
-			foreach ($categories as $category) 
+			foreach ($categories as $category)
 			{
 				$count++;
 				extract($category);
@@ -283,7 +284,7 @@ class Dotclear_Import {
 								'display_name'	=> $Realname)
 								);
 				}
-				else 
+				else
 				{
 					$ret_id = wp_insert_user(array(
 								'user_login'	=> $user_id,
@@ -384,7 +385,7 @@ class Dotclear_Import {
 							'comment_count'		=> $post_nb_comment + $post_nb_trackback)
 							);
 				}
-				else 
+				else
 				{
 					$ret_id = wp_insert_post(array(
 							'post_author'		=> $authorid,
@@ -460,7 +461,7 @@ class Dotclear_Import {
 							'comment_approved'	=> $comment_approved)
 							);
 				}
-				else 
+				else
 				{
 					// Insert comments
 					$ret_id = wp_insert_comment(array(
@@ -547,7 +548,7 @@ class Dotclear_Import {
 		return false;
 	}
 
-	function import_categories() 
+	function import_categories()
 	{
 		// Category Import
 		$cats = $this->get_dc_cats();
@@ -565,7 +566,7 @@ class Dotclear_Import {
 	function import_users()
 	{
 		// User Import
-		$users = $this->get_dc_users(); 
+		$users = $this->get_dc_users();
 		$this->users2wp($users);
 
 		echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">';
@@ -655,7 +656,7 @@ class Dotclear_Import {
 		echo '</table>';
 	}
 
-	function dispatch() 
+	function dispatch()
 	{
 
 		if (empty ($_GET['step']))
@@ -664,7 +665,7 @@ class Dotclear_Import {
 			$step = (int) $_GET['step'];
 		$this->header();
 
-		if ( $step > 0 ) 
+		if ( $step > 0 )
 		{
 			if($_POST['dbuser'])
 			{
@@ -689,25 +690,25 @@ class Dotclear_Import {
 			{
 				if(get_option('dchost'))
 					delete_option('dchost');
-				add_option('dchost',$_POST['dbhost']); 
+				add_option('dchost',$_POST['dbhost']);
 			}
 			if($_POST['dccharset'])
 			{
 				if(get_option('dccharset'))
 					delete_option('dccharset');
-				add_option('dccharset',$_POST['dccharset']); 
+				add_option('dccharset',$_POST['dccharset']);
 			}
 			if($_POST['dbprefix'])
 			{
 				if(get_option('dcdbprefix'))
 					delete_option('dcdbprefix');
-				add_option('dcdbprefix',$_POST['dbprefix']); 
+				add_option('dcdbprefix',$_POST['dbprefix']);
 			}
 
 
 		}
 
-		switch ($step) 
+		switch ($step)
 		{
 			default:
 			case 0 :
@@ -736,7 +737,7 @@ class Dotclear_Import {
 		$this->footer();
 	}
 
-	function Dotclear_Import() 
+	function Dotclear_Import()
 	{
 		// Nothing.
 	}
diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index 5494197..ea05ff2 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -66,10 +66,10 @@ class GM_Import {
 		$string = str_replace("|*|","<br />\n",$string);
 		return($string);
 	}
-	
+
 	function import() {
 		global $wpdb;
-	
+
 		$wpvarstoreset = array('gmpath', 'archivespath', 'lastentry');
 		for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 			$wpvar = $wpvarstoreset[$i];
@@ -136,11 +136,11 @@ class GM_Import {
 <li><?php _e('importing posts, comments, and karma...') ?><br /><ul><?php
 
 	chdir($archivespath);
-	
+
 	for($i = 0; $i <= $lastentry; $i = $i + 1) {
-		
+
 		$entryfile = "";
-		
+
 		if ($i<10000000) {
 			$entryfile .= "0";
 			if ($i<1000000) {
@@ -194,7 +194,7 @@ class GM_Import {
 			$post_status = 'publish'; //in greymatter, there are no drafts
 			$comment_status = 'open';
 			$ping_status = 'closed';
-			
+
 			if ($post_ID = post_exists($post_title, '', $post_date)) {
 				echo ' ';
 				_e('(already exists)');
@@ -303,7 +303,7 @@ class GM_Import {
 	}
 
 	function GM_Import() {
-		// Nothing.	
+		// Nothing.
 	}
 }
 
diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php
index d484ba7..ffb869b 100644
--- a/wp-admin/import/mt.php
+++ b/wp-admin/import/mt.php
@@ -375,7 +375,7 @@ class MT_Import {
 
 	function import() {
 		$this->id = (int) $_GET['id'];
-		
+
 		$this->file = get_attached_file($this->id);
 		$this->get_authors_from_post();
 		$this->get_entries();
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index e1a0339..435a588 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -4,7 +4,7 @@
 **/
 if(!function_exists('get_catbynicename'))
 {
-	function get_catbynicename($category_nicename) 
+	function get_catbynicename($category_nicename)
 	{
 	global $wpdb;
 
@@ -70,13 +70,13 @@ class Textpattern_Import {
 		$prefix = get_option('tpre');
 
 		// Get Categories
-		return $txpdb->get_results('SELECT 
-										id,
-										name,
-										title
-							   		 FROM '.$prefix.'txp_category 
-							   		 WHERE type = "article"', 
-									 ARRAY_A);
+		return $txpdb->get_results('SELECT
+			id,
+			name,
+			title
+			FROM '.$prefix.'txp_category
+			WHERE type = "article"',
+			ARRAY_A);
 	}
 
 	function get_txp_users()
@@ -90,12 +90,12 @@ class Textpattern_Import {
 		// Get Users
 
 		return $txpdb->get_results('SELECT
-										user_id,
-										name,
-										RealName,
-										email,
-										privs
-							   		FROM '.$prefix.'txp_users', ARRAY_A);
+			user_id,
+			name,
+			RealName,
+			email,
+			privs
+			FROM '.$prefix.'txp_users', ARRAY_A);
 	}
 
 	function get_txp_posts()
@@ -106,22 +106,22 @@ class Textpattern_Import {
 		$prefix = get_option('tpre');
 
 		// Get Posts
-		return $txpdb->get_results('SELECT 
-										ID,
-										Posted,
-										AuthorID,
-										LastMod,
-										Title,
-										Body,
-										Excerpt,
-										Category1,
-										Category2,
-										Status,
-										Keywords,
-										url_title,
-										comments_count
-							   		FROM '.$prefix.'textpattern
-							   		', ARRAY_A);
+		return $txpdb->get_results('SELECT
+			ID,
+			Posted,
+			AuthorID,
+			LastMod,
+			Title,
+			Body,
+			Excerpt,
+			Category1,
+			Category2,
+			Status,
+			Keywords,
+			url_title,
+			comments_count
+			FROM '.$prefix.'textpattern
+			', ARRAY_A);
 	}
 
 	function get_txp_comments()
@@ -143,18 +143,18 @@ class Textpattern_Import {
 		set_magic_quotes_runtime(0);
 		$prefix = get_option('tpre');
 
-		return $txpdb->get_results('SELECT 
-										id,
-										date,
-										category,
-										url,
-										linkname,
-										description
-									  FROM '.$prefix.'txp_link', 
-									  ARRAY_A);						  
+		return $txpdb->get_results('SELECT
+			id,
+			date,
+			category,
+			url,
+			linkname,
+			description
+			FROM '.$prefix.'txp_link',
+			ARRAY_A);
 	}
 
-	function cat2wp($categories='') 
+	function cat2wp($categories='')
 	{
 		// General Housekeeping
 		global $wpdb;
@@ -164,7 +164,7 @@ class Textpattern_Import {
 		if(is_array($categories))
 		{
 			echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
-			foreach ($categories as $category) 
+			foreach ($categories as $category)
 			{
 				$count++;
 				extract($category);
@@ -226,7 +226,7 @@ class Textpattern_Import {
 								'display_name'	=> $name)
 								);
 				}
-				else 
+				else
 				{
 					$ret_id = wp_insert_user(array(
 								'user_login'	=> $name,
@@ -302,35 +302,35 @@ class Textpattern_Import {
 				if($pinfo = post_exists($Title,$Body))
 				{
 					$ret_id = wp_insert_post(array(
-							'ID'				=> $pinfo,
-							'post_date'			=> $Posted,
-							'post_date_gmt'		=> $post_date_gmt,
-							'post_author'		=> $authorid,
-							'post_modified'		=> $LastMod,
-							'post_modified_gmt' => $post_modified_gmt,
-							'post_title'		=> $Title,
-							'post_content'		=> $Body,
-							'post_excerpt'		=> $Excerpt,
-							'post_status'		=> $post_status,
-							'post_name'			=> $url_title,
-							'comment_count'		=> $comments_count)
-							);
+						'ID'				=> $pinfo,
+						'post_date'			=> $Posted,
+						'post_date_gmt'		=> $post_date_gmt,
+						'post_author'		=> $authorid,
+						'post_modified'		=> $LastMod,
+						'post_modified_gmt' => $post_modified_gmt,
+						'post_title'		=> $Title,
+						'post_content'		=> $Body,
+						'post_excerpt'		=> $Excerpt,
+						'post_status'		=> $post_status,
+						'post_name'			=> $url_title,
+						'comment_count'		=> $comments_count)
+						);
 				}
-				else 
+				else
 				{
 					$ret_id = wp_insert_post(array(
-							'post_date'			=> $Posted,
-							'post_date_gmt'		=> $post_date_gmt,
-							'post_author'		=> $authorid,
-							'post_modified'		=> $LastMod,
-							'post_modified_gmt' => $post_modified_gmt,
-							'post_title'		=> $Title,
-							'post_content'		=> $Body,
-							'post_excerpt'		=> $Excerpt,
-							'post_status'		=> $post_status,
-							'post_name'			=> $url_title,
-							'comment_count'		=> $comments_count)
-							);
+						'post_date'			=> $Posted,
+						'post_date_gmt'		=> $post_date_gmt,
+						'post_author'		=> $authorid,
+						'post_modified'		=> $LastMod,
+						'post_modified_gmt' => $post_modified_gmt,
+						'post_title'		=> $Title,
+						'post_content'		=> $Body,
+						'post_excerpt'		=> $Excerpt,
+						'post_status'		=> $post_status,
+						'post_name'			=> $url_title,
+						'comment_count'		=> $comments_count)
+						);
 				}
 				$txpposts2wpposts[$ID] = $ret_id;
 
@@ -379,29 +379,29 @@ class Textpattern_Import {
 				{
 					// Update comments
 					$ret_id = wp_update_comment(array(
-							'comment_ID'			=> $cinfo,
-							'comment_post_ID'		=> $comment_post_ID,
-							'comment_author'		=> $name,
-							'comment_author_email'	=> $email,
-							'comment_author_url'	=> $web,
-							'comment_date'			=> $posted,
-							'comment_content'		=> $message,
-							'comment_approved'		=> $comment_approved)
-							);
+						'comment_ID'			=> $cinfo,
+						'comment_post_ID'		=> $comment_post_ID,
+						'comment_author'		=> $name,
+						'comment_author_email'	=> $email,
+						'comment_author_url'	=> $web,
+						'comment_date'			=> $posted,
+						'comment_content'		=> $message,
+						'comment_approved'		=> $comment_approved)
+						);
 				}
-				else 
+				else
 				{
 					// Insert comments
 					$ret_id = wp_insert_comment(array(
-							'comment_post_ID'		=> $comment_post_ID,
-							'comment_author'		=> $name,
-							'comment_author_email'	=> $email,
-							'comment_author_url'	=> $web,
-							'comment_author_IP'		=> $ip,
-							'comment_date'			=> $posted,
-							'comment_content'		=> $message,
-							'comment_approved'		=> $comment_approved)
-							);
+						'comment_post_ID'		=> $comment_post_ID,
+						'comment_author'		=> $name,
+						'comment_author_email'	=> $email,
+						'comment_author_url'	=> $web,
+						'comment_author_IP'		=> $ip,
+						'comment_date'			=> $posted,
+						'comment_content'		=> $message,
+						'comment_approved'		=> $comment_approved)
+						);
 				}
 				$txpcm2wpcm[$comment_ID] = $ret_id;
 			}
@@ -450,7 +450,7 @@ class Textpattern_Import {
 								'link_updated'		=> $date)
 								);
 				}
-				else 
+				else
 				{
 					$ret_id = wp_insert_link(array(
 								'link_url'			=> $url,
@@ -472,7 +472,7 @@ class Textpattern_Import {
 		return false;
 	}
 
-	function import_categories() 
+	function import_categories()
 	{
 		// Category Import
 		$cats = $this->get_txp_cats();
@@ -490,7 +490,7 @@ class Textpattern_Import {
 	function import_users()
 	{
 		// User Import
-		$users = $this->get_txp_users(); 
+		$users = $this->get_txp_users();
 		$this->users2wp($users);
 
 		echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
@@ -578,7 +578,7 @@ class Textpattern_Import {
 		echo '</table>';
 	}
 
-	function dispatch() 
+	function dispatch()
 	{
 
 		if (empty ($_GET['step']))
@@ -587,7 +587,7 @@ class Textpattern_Import {
 			$step = (int) $_GET['step'];
 		$this->header();
 
-		if ( $step > 0 ) 
+		if ( $step > 0 )
 		{
 			if($_POST['dbuser'])
 			{
@@ -612,19 +612,19 @@ class Textpattern_Import {
 			{
 				if(get_option('txphost'))
 					delete_option('txphost');
-				add_option('txphost',$_POST['dbhost']); 
+				add_option('txphost',$_POST['dbhost']);
 			}
 			if($_POST['dbprefix'])
 			{
 				if(get_option('tpre'))
 					delete_option('tpre');
-				add_option('tpre',$_POST['dbprefix']); 
+				add_option('tpre',$_POST['dbprefix']);
 			}
 
 
 		}
 
-		switch ($step) 
+		switch ($step)
 		{
 			default:
 			case 0 :
@@ -653,7 +653,7 @@ class Textpattern_Import {
 		$this->footer();
 	}
 
-	function Textpattern_Import() 
+	function Textpattern_Import()
 	{
 		// Nothing.
 	}
diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index b850382..ac965b8 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -256,7 +256,7 @@ class WP_Import {
 

 	function import() {

 		$this->id = (int) $_GET['id'];

-		

+

 		$this->file = get_attached_file($this->id);

 		$this->get_authors_from_post();

 		$this->get_entries();

diff --git a/wp-admin/index-extra.php b/wp-admin/index-extra.php
new file mode 100644
index 0000000..782e0a7
--- /dev/null
+++ b/wp-admin/index-extra.php
@@ -0,0 +1,67 @@
+<?php
+require_once('admin.php');
+require_once (ABSPATH . WPINC . '/rss.php');
+
+switch ( $_GET['jax'] ) {
+
+case 'incominglinks' :
+$rss = @fetch_rss('http://feeds.technorati.com/cosmos/rss/?url='. trailingslashit(get_option('home')) .'&partner=wordpress');
+if ( isset($rss->items) && 1 < count($rss->items) ) { // Technorati returns a 1-item feed when it has no results
+?>
+<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More &raquo;'); ?></a></cite></h3>
+<ul>
+<?php
+$rss->items = array_slice($rss->items, 0, 10);
+foreach ($rss->items as $item ) {
+?>
+	<li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wptexturize(wp_specialchars($item['title'])); ?></a></li>
+<?php } ?>
+</ul>
+<?php
+}
+break;
+
+case 'devnews' :
+$rss = @fetch_rss('http://wordpress.org/development/feed/');
+if ( isset($rss->items) && 0 != count($rss->items) ) {
+?>
+<h3><?php _e('WordPress Development Blog'); ?></h3>
+<?php
+$rss->items = array_slice($rss->items, 0, 3);
+foreach ($rss->items as $item ) {
+?>
+<h4><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a> &#8212; <?php printf(__('%s ago'), human_time_diff(strtotime($item['pubdate'], time() ) ) ); ?></h4>
+<p><?php echo $item['description']; ?></p>
+<?php
+	}
+}
+?>
+
+<?php
+break;
+
+case 'planetnews' :
+$rss = @fetch_rss('http://planet.wordpress.org/feed/');
+if ( isset($rss->items) && 0 != count($rss->items) ) {
+?>
+<h3><?php _e('Other WordPress News'); ?></h3>
+<ul>
+<?php
+$rss->items = array_slice($rss->items, 0, 20);
+foreach ($rss->items as $item ) {
+$title = wp_specialchars($item['title']);
+$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
+$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
+?>
+<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
+<?php
+	}
+?>
+</ul>
+<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
+<?php
+}
+break;
+}
+
+?>
\ No newline at end of file
diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index 86138db..b441c34 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -9,21 +9,21 @@ $debug = 0;
  **           false on error
  */
 function maybe_create_table($table_name, $create_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    return false;
+	global $wpdb;
+	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+		if ($table == $table_name) {
+			return true;
+		}
+	}
+	//didn't find it try to create it.
+	$q = $wpdb->query($create_ddl);
+	// we cannot directly tell that whether this succeeded!
+	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+		if ($table == $table_name) {
+			return true;
+		}
+	}
+	return false;
 }
 
 /**
@@ -33,22 +33,22 @@ function maybe_create_table($table_name, $create_ddl) {
  **           false on error
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-    global $wpdb, $debug;
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($debug) echo("checking $column == $column_name<br />");
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    return false;
+	global $wpdb, $debug;
+	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+		if ($debug) echo("checking $column == $column_name<br />");
+			if ($column == $column_name) {
+				return true;
+			}
+	}
+	//didn't find it try to create it.
+	$q = $wpdb->query($create_ddl);
+	// we cannot directly tell that whether this succeeded!
+	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+		if ($column == $column_name) {
+			return true;
+		}
+	}
+	return false;
 }
 
 
@@ -59,21 +59,21 @@ function maybe_add_column($table_name, $column_name, $create_ddl) {
  **           false on error
  */
 function maybe_drop_column($table_name, $column_name, $drop_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($column == $column_name) {
-            //found it try to drop it.
-            $q = $wpdb->query($drop_ddl);
-            // we cannot directly tell that whether this succeeded!
-            foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-                if ($column == $column_name) {
-                    return false;
-                }
-            }
-        }
-    }
-    // else didn't find it
-    return true;
+	global $wpdb;
+	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+		if ($column == $column_name) {
+			//found it try to drop it.
+			$q = $wpdb->query($drop_ddl);
+			// we cannot directly tell that whether this succeeded!
+			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+				if ($column == $column_name) {
+					return false;
+				}
+			}
+		}
+	}
+	// else didn't find it
+	return true;
 }
 
 
@@ -92,45 +92,45 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  **      Extra
  */
 function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
-    global $wpdb, $debug;
-    $diffs = 0;
-    $results = $wpdb->get_results("DESC $table_name");
-    
-    foreach ($results as $row ) {
-        if ($debug > 1) print_r($row);
-        if ($row->Field == $col_name) {
-            // got our column, check the params
-            if ($debug) echo ("checking $row->Type against $col_type\n");
-            if (($col_type != null) && ($row->Type != $col_type)) {
-                ++$diffs;
-            }
-            if (($is_null != null) && ($row->Null != $is_null)) {
-                ++$diffs;
-            }
-            if (($key != null) && ($row->Key  != $key)) {
-                ++$diffs;
-            }
-            if (($default != null) && ($row->Default != $default)) {
-                ++$diffs;
-            }
-            if (($extra != null) && ($row->Extra != $extra)) {
-                ++$diffs;
-            }
-            if ($diffs > 0) {
-                if ($debug) echo ("diffs = $diffs returning false\n");
-                return false;
-            }
-            return true;
-        } // end if found our column
-    }
-    return false;
+	global $wpdb, $debug;
+	$diffs = 0;
+	$results = $wpdb->get_results("DESC $table_name");
+
+	foreach ($results as $row ) {
+		if ($debug > 1) print_r($row);
+			if ($row->Field == $col_name) {
+				// got our column, check the params
+				if ($debug) echo ("checking $row->Type against $col_type\n");
+				if (($col_type != null) && ($row->Type != $col_type)) {
+					++$diffs;
+				}
+				if (($is_null != null) && ($row->Null != $is_null)) {
+					++$diffs;
+				}
+				if (($key != null) && ($row->Key  != $key)) {
+					++$diffs;
+				}
+				if (($default != null) && ($row->Default != $default)) {
+					++$diffs;
+				}
+				if (($extra != null) && ($row->Extra != $extra)) {
+					++$diffs;
+				}
+				if ($diffs > 0) {
+					if ($debug) echo ("diffs = $diffs returning false\n");
+					return false;
+				}
+				return true;
+			} // end if found our column
+	}
+	return false;
 }
-    
+
 /*
 echo "<p>testing</p>";
 echo "<pre>";
 
-//check_column('wp_links', 'link_description', 'mediumtext'); 
+//check_column('wp_links', 'link_description', 'mediumtext');
 //if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
 //    echo "ok\n";
 $error_count = 0;
@@ -138,15 +138,15 @@ $tablename = $wpdb->links;
 // check the column
 if (!check_column($wpdb->links, 'link_description', 'varchar(255)'))
 {
-    $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
-    $q = $wpdb->query($ddl);
+	$ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+	$q = $wpdb->query($ddl);
 }
 if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
-    $res .= $tablename . ' - ok <br />';
+	$res .= $tablename . ' - ok <br />';
 } else {
-    $res .= 'There was a problem with ' . $tablename . '<br />';
-    ++$error_count;
+	$res .= 'There was a problem with ' . $tablename . '<br />';
+	++$error_count;
 }
 echo "</pre>";
 */
-?>
\ No newline at end of file
+?>
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 22dcc64..2f66e44 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -1,15 +1,15 @@
 <?php
 require_once('admin.php');
 
-$title = __('Add Bookmark');
+$title = __('Add Link');
 $this_file = 'link-manager.php';
 $parent_file = 'link-manager.php';
 
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
-                       'description', 'visible', 'target', 'category', 'link_id',
-                       'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
-                       'notes', 'linkcheck[]'));
+	'description', 'visible', 'target', 'category', 'link_id',
+	'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
+	'notes', 'linkcheck[]'));
 
 wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
 if ( current_user_can( 'manage_categories' ) )
diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index 98bdc87..9f1e0c0 100644
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -16,7 +16,7 @@ switch ($step) {
     {
         include_once('admin-header.php');
         if ( !current_user_can('manage_links') )
-            die (__("Cheatin&#8217; uh?"));
+            wp_die(__('Cheatin&#8217; uh?'));
 
         $opmltype = 'blogrolling'; // default.
 ?>
@@ -26,7 +26,7 @@ switch ($step) {
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
 <?php wp_nonce_field('import-bookmarks') ?>
 
-<p><?php _e('If a program or website you use allows you to export your bookmarks or subscriptions as OPML you may import them here.'); ?>
+<p><?php _e('If a program or website you use allows you to export your links or subscriptions as OPML you may import them here.'); ?>
 <div style="width: 70%; margin: auto; height: 8em;">
 <input type="hidden" name="step" value="1" />
 <input type="hidden" name="MAX_FILE_SIZE" value="30000" />
@@ -43,7 +43,7 @@ switch ($step) {
 
 </div>
 
-<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these bookmarks in.') ?><br />
+<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
 <?php _e('Category:') ?> <select name="cat_id">
 <?php
 $categories = get_categories('hide_empty=0');
@@ -68,7 +68,7 @@ foreach ($categories as $category) {
 
                 include_once('admin-header.php');
                 if ( !current_user_can('manage_links') )
-                    die (__("Cheatin' uh ?"));
+                    wp_die(__('Cheatin&#8217; uh?'));
 ?>
 <div class="wrap">
 
@@ -111,7 +111,7 @@ foreach ($categories as $category) {
 						echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
                     }
 ?>
-     <p><?php printf(__('Inserted %1$d bookmarks into category %2$s. All done! Go <a href="%3$s">manage those bookmarks</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+     <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
 <?php
                 } // end if got url
                 else
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index a4a2639..abb1d37 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -6,8 +6,6 @@
 
 require_once ('admin.php');
 
-$title = __('Manage Bookmarks');
-$this_file = $parent_file = 'link-manager.php';
 wp_enqueue_script( 'listman' );
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
@@ -18,11 +16,12 @@ if (empty ($cat_id))
 if (empty ($order_by))
 	$order_by = 'order_name';
 
-$title = __('Manage Bookmarks');
+$title = __('Manage Blogroll');
+$this_file = $parent_file = 'link-manager.php';
 include_once ("./admin-header.php");
 
 if (!current_user_can('manage_links'))
-	wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
+	wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
 
 switch ($order_by) {
 	case 'order_id' :
@@ -66,7 +65,7 @@ function checkAll(form)
 if ( isset($_GET['deleted']) ) {
 	echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
 	$deleted = (int) $_GET['deleted'];
-	printf(__('%s bookmarks deleted.'), $deleted);
+	printf(__('%s links deleted.'), $deleted);
 	echo '</p></div>';
 }
 ?>
@@ -85,7 +84,7 @@ foreach ((array) $categories as $cat)
 $select_cat .= "</select>\n";
 
 $select_order = "<select name=\"order_by\">\n";
-$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Bookmark ID') . "</option>\n";
+$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Link ID') . "</option>\n";
 $select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Name') . "</option>\n";
 $select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Address') . "</option>\n";
 $select_order .= "</select>\n";
@@ -143,8 +142,8 @@ if ($links)
 		echo $link->link_description . "</td>";
 		echo "<td><a href=\"$link->link_url\" title=\"".sprintf(__('Visit %s'), $link->link_name)."\">$short_url</a></td>";
 		?>
-        <td>
-        <?php
+		<td>
+		<?php
 
 		$cat_names = array();
 		foreach ($link->link_category as $category) {
@@ -157,12 +156,12 @@ if ($links)
 		echo implode(', ', $cat_names);
 		?>
 		</td>
-        <td><?php echo $link->link_rel; ?></td>
-        <td align='center'><?php echo $visible; ?></td>
+		<td><?php echo $link->link_rel; ?></td>
+		<td align='center'><?php echo $visible; ?></td>
 <?php
 
 		echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
-		echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; bookmark to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
+		echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
 		echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
 		echo "\n    </tr>\n";
 	}
@@ -172,7 +171,7 @@ if ($links)
 
 <div id="ajax-response"></div>
 
-<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these bookmarks permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
+<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Links') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these links permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
 </form>
 </div>
 
diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php
index 196f3cb..0e5edf0 100644
--- a/wp-admin/link-parse-opml.php
+++ b/wp-admin/link-parse-opml.php
@@ -4,12 +4,12 @@ require_once('../wp-config.php');
 // columns we wish to find are:  link_url, link_name, link_target, link_description
 // we need to map XML attribute names to our columns
 $opml_map = array('URL'         => 'link_url',
-                  'HTMLURL'     => 'link_url',
-                  'TEXT'        => 'link_name',
-                  'TITLE'       => 'link_name',
-                  'TARGET'      => 'link_target',
-                  'DESCRIPTION' => 'link_description',
-                  'XMLURL'      => 'link_rss'
+	'HTMLURL'     => 'link_url',
+	'TEXT'        => 'link_name',
+	'TITLE'       => 'link_name',
+	'TARGET'      => 'link_target',
+	'DESCRIPTION' => 'link_description',
+	'XMLURL'      => 'link_rss'
 );
 
 $map = $opml_map;
@@ -20,24 +20,24 @@ $map = $opml_map;
  **/
 function startElement($parser, $tagName, $attrs) {
 	global $updated_timestamp, $all_links, $map;
-    global $names, $urls, $targets, $descriptions, $feeds;
+	global $names, $urls, $targets, $descriptions, $feeds;
 
 	if ($tagName == 'OUTLINE') {
-        foreach (array_keys($map) as $key) {
-            if (isset($attrs[$key])) {
-                $$map[$key] = $attrs[$key];
-            }
-        }
+		foreach (array_keys($map) as $key) {
+			if (isset($attrs[$key])) {
+				$$map[$key] = $attrs[$key];
+			}
+		}
 
-        //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
+		//echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
 
-        // save the data away.
-        $names[] = $link_name;
-        $urls[] = $link_url;
-        $targets[] = $link_target;
+		// save the data away.
+		$names[] = $link_name;
+		$urls[] = $link_url;
+		$targets[] = $link_target;
 		$feeds[] = $link_rss;
-        $descriptions[] = $link_description;
-    } // end if outline
+		$descriptions[] = $link_description;
+	} // end if outline
 }
 
 /**
@@ -55,9 +55,9 @@ $xml_parser = xml_parser_create();
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
 if (!xml_parse($xml_parser, $opml, true)) {
-    echo(sprintf(__('XML error: %1$s at line %2$s'),
-                   xml_error_string(xml_get_error_code($xml_parser)),
-                   xml_get_current_line_number($xml_parser)));
+	echo(sprintf(__('XML error: %1$s at line %2$s'),
+	xml_error_string(xml_get_error_code($xml_parser)),
+	xml_get_current_line_number($xml_parser)));
 }
 
 // Free up memory used by the XML parser
diff --git a/wp-admin/link.php b/wp-admin/link.php
index 0590f16..425e912 100644
--- a/wp-admin/link.php
+++ b/wp-admin/link.php
@@ -29,12 +29,13 @@ switch ($action) {
 		$deleted = 0;
 		foreach ($linkcheck as $link_id) {
 			$link_id = (int) $link_id;
-			
+
 			if ( wp_delete_link($link_id) )
 				$deleted++;
 		}
 
 		wp_redirect("$this_file?deleted=$deleted");
+		exit;
 		break;
 
 	case 'move' :
@@ -54,6 +55,7 @@ switch ($action) {
 		//$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
 
 		wp_redirect($this_file);
+		exit;
 		break;
 
 	case 'add' :
@@ -62,6 +64,7 @@ switch ($action) {
 		add_link();
 
 		wp_redirect(wp_get_referer().'?added=true');
+		exit;
 		break;
 
 	case 'save' :
@@ -84,6 +87,7 @@ switch ($action) {
 		wp_delete_link($link_id);
 
 		wp_redirect($this_file);
+		exit;
 		break;
 
 	case 'edit' :
@@ -92,10 +96,10 @@ switch ($action) {
 			wp_enqueue_script( 'ajaxcat' );
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
-		$title = __('Edit Bookmark');
+		$title = __('Edit Link');
 		include_once ('admin-header.php');
 		if (!current_user_can('manage_links'))
-			wp_die(__('You do not have sufficient permissions to edit the bookmarks for this blog.'));
+			wp_die(__('You do not have sufficient permissions to edit the links for this blog.'));
 
 		$link_id = (int) $_GET['link_id'];
 
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index d113276..046590e 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -10,8 +10,15 @@ foreach ($menu as $item) {
 
 	// 0 = name, 1 = capability, 2 = file
 	if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-    
-	if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
+
+	if ( !empty($submenu[$item[2]]) ) {
+		$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+		$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+			echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+		else
+			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+	} else if ( current_user_can($item[1]) ) {
 		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
 			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
 		else
@@ -27,8 +34,8 @@ foreach ($menu as $item) {
 if ( isset($submenu["$parent_file"]) ) :
 ?>
 <ul id="submenu">
-<?php 
-foreach ($submenu["$parent_file"] as $item) : 
+<?php
+foreach ($submenu["$parent_file"] as $item) :
 	 if ( !current_user_can($item[1]) )
 		 continue;
 
@@ -58,7 +65,7 @@ else :
 <div id="minisub"></div>
 <?php
 
-endif; 
+endif;
 
 do_action('admin_notices');
 
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index a506d1b..bb82c1f 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -17,7 +17,8 @@ else
 $menu_perms = get_site_option( "menu_items" );
 if( is_array( $menu_perms ) == false )
 	$menu_perms = array();
-
+	
+$menu[15] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
 $menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
 $menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
 if( $menu_perms[ 'plugins' ] == 1 )
@@ -32,13 +33,15 @@ $menu[40] = array(__('Options'), 'manage_options', 'options-general.php');
 $submenu['post-new.php'][5] = array(__('Write Post'), 'edit_posts', 'post-new.php');
 $submenu['post-new.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
 
+$submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
+$awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
+$submenu['edit-comments.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), "<span id='awaitmod'>$awaiting_mod</span>"), 'edit_posts', 'moderation.php');
+
+
 $submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
 $submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
 $submenu['edit.php'][12] = array(__('Uploads'), 'upload_files', 'upload.php');
 $submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
-$submenu['edit.php'][20] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
-$awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
-$submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), "<span id='awaitmod'>$awaiting_mod</span>"), 'edit_posts', 'moderation.php');
 //$submenu['edit.php'][30] = array(__('Files'), 'edit_files', 'templates.php');
 $submenu['edit.php'][35] = array(__('Import'), 'import', 'import.php');
 $submenu['edit.php'][40] = array(__('Export'), 'import', 'export.php');
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index b9e3f06..e9fc505 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Moderate comments');
-$parent_file = 'edit.php';
+$parent_file = 'edit-comments.php';
 wp_enqueue_script( 'admin-comments' );
 
 wp_reset_vars(array('action', 'item_ignored', 'item_deleted', 'item_approved', 'item_spam', 'feelinglucky'));
@@ -31,7 +31,7 @@ case 'update':
 	foreach($comment as $key => $value) {
 	if ($feelinglucky && 'later' == $value)
 		$value = 'delete';
-	    switch($value) {
+		switch($value) {
 			case 'later':
 				// do nothing with that comment
 				// wp_set_comment_status($key, "hold");
@@ -41,10 +41,10 @@ case 'update':
 				wp_set_comment_status($key, 'delete');
 				++$item_deleted;
 				break;
- 			case 'spam':
- 				wp_set_comment_status($key, 'spam');
- 				++$item_spam;
- 				break;
+			case 'spam':
+				wp_set_comment_status($key, 'spam');
+				++$item_spam;
+				break;
 			case 'approve':
 				wp_set_comment_status($key, 'approve');
 				if ( get_option('comments_notify') == true ) {
@@ -52,7 +52,7 @@ case 'update':
 				}
 				++$item_approved;
 				break;
-	    }
+		}
 	}
 
 	$file = basename(__FILE__);
@@ -85,13 +85,13 @@ if ( isset($_GET['deleted']) || isset($_GET['approved']) || isset($_GET['ignored
 			echo sprintf(__("%s comments deleted"), $deleted) . " <br/>\n";
 		}
 	}
- 	if ($spam) {
- 		if ('1' == $spam) {
+	if ($spam) {
+		if ('1' == $spam) {
 			echo __("1 comment marked as spam") . " <br/>\n";
- 		} else {
- 			echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
- 		}
- 	}
+		} else {
+			echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
+		}
+	}
 	if ($ignored) {
 		if ('1' == $ignored) {
 			echo __("1 comment unchanged") . " <br/>\n";
@@ -151,13 +151,13 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
 
 	</li>
 <?php
-    }
+	}
 ?>
-    </ol>
+	</ol>
 
 <div id="ajax-response"></div>
 
-    <p class="submit"><input type="submit" name="submit" value="<?php _e('Bulk Moderate Comments &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Bulk Moderate Comments &raquo;') ?>" /></p>
 <script type="text/javascript">
 // <![CDATA[
 function markAllForDelete() {
@@ -197,10 +197,10 @@ document.write('<ul><li><a href="javascript:markAllForApprove()"><?php _e('Mark
 		<input name="feelinglucky" type="checkbox" id="feelinglucky" value="true" /> <label for="feelinglucky"><?php _e('Delete every comment marked "defer." <strong>Warning: This can&#8217;t be undone.</strong>'); ?></label>
 	</p>
 </noscript>
-    </form>
+</form>
 <?php
 } else {
-    // nothing to approve
+	// nothing to approve
 	echo '<p>'.__("Currently there are no comments for you to moderate.") . "</p>\n";
 }
 ?>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index dba00f2..cb68832 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -8,9 +8,9 @@ $parent_file = 'options-general.php';
 include('admin-header.php');
 
 ?>
- 
-<div class="wrap"> 
-<h2><?php _e('Miscellaneous Options') ?></h2> 
+
+<div class="wrap">
+<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>
@@ -44,10 +44,10 @@ include('admin-header.php');
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" /> 
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
-</form> 
+</form>
 </div>
 
 <?php include('./admin-footer.php'); ?>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index a5d17f1..eb7ac66 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -144,7 +144,7 @@ $structures = array(
 <?php if ( !in_array($permalink_structure, $structures) ) { ?>
 checked="checked"
 <?php } ?>
- /> 
+ />
 <?php _e('Custom, specify below'); ?>
 </label>
 <br />
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index fc73637..c603a88 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -63,10 +63,7 @@ if ( 'page' == get_option('show_on_front') ) {
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
 <td>
-<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> 
-<select name="what_to_show" id="what_to_show" > 
-<option value="days" <?php selected('days', get_option('what_to_show')); ?>><?php _e('days') ?></option> 
-<option value="posts" <?php selected('posts', get_option('what_to_show')); ?>><?php _e('posts') ?></option> 
+<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
 </select>
 </td> 
 </tr> 
@@ -99,7 +96,8 @@ if ( 'page' == get_option('show_on_front') ) {
 </table> 
 <p class="submit"> 
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,show_on_front,page_on_front,page_for_posts" /> 
+<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
+<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,show_on_front,page_on_front,page_for_posts" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
 </p> 
 </form> 
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index acb6dff..59e1c49 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -57,11 +57,11 @@ endforeach;
 
 
 <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,default_category,default_email_category,use_balanceTags,default_link_category" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
+<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
-</form> 
-</div> 
+</form>
+</div>
 
 <?php include('./admin-footer.php') ?>
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 42fe9d4..3020b48 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -62,8 +62,8 @@ default:
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif; ?>
- <div class="wrap"> 
-  <?php
+ <div class="wrap">
+	<?php
 	if (is_writeable($real_file)) {
 		echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
 	} else {
@@ -76,39 +76,39 @@ default:
 <?php
 if ($plugin_files) :
 ?>
-  <ul>
-<?php foreach($plugin_files as $plugin_file) : ?>
+	<ul>
+	<?php foreach($plugin_files as $plugin_file) : ?>
 		 <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
-<?php endforeach; ?>
-  </ul>
+	<?php endforeach; ?>
+	</ul>
 <?php endif; ?>
 </div>
-	<?php	if (!$error) { ?> 
-  <form name="template" id="template" action="plugin-editor.php" method="post">
-  <?php wp_nonce_field('edit-plugin_' . $file) ?>
-		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
+<?php	if (!$error) { ?>
+	<form name="template" id="template" action="plugin-editor.php" method="post">
+	<?php wp_nonce_field('edit-plugin_' . $file) ?>
+		<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+		<input type="hidden" name="action" value="update" />
+		<input type="hidden" name="file" value="<?php echo $file ?>" />
 		</div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
-<?php
-	echo "<input type='submit' name='submit' value='	" . __('Update File &raquo;') . "' tabindex='2' />";
-?>
-</p>
+	<p class="submit">
+	<?php
+		echo "<input type='submit' name='submit' value='	" . __('Update File &raquo;') . "' tabindex='2' />";
+	?>
+	</p>
 <?php else : ?>
-<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
+	<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+ </form>
+<?php
 	} else {
 		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
 	}
-	?>
+?>
 <div class="clear"> &nbsp; </div>
-</div> 
+</div>
 <?php
 break;
 }
 
-include("admin-footer.php") ?> 
+include("admin-footer.php") ?>
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 2acf689..f224937 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -12,12 +12,17 @@ if ( isset($_GET['action']) ) {
 	if ('activate' == $_GET['action']) {
 		check_admin_referer('activate-plugin_' . $_GET['plugin']);
 		$current = get_option('active_plugins');
-		if (!in_array($_GET['plugin'], $current)) {
-			$current[] = trim( $_GET['plugin'] );
+		$plugin = trim($_GET['plugin']);
+		if ( validate_file($plugin) )
+			wp_die(__('Invalid plugin.'));
+		if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
+			wp_die(__('Plugin file does not exist.'));
+		if (!in_array($plugin, $current)) {
+			$current[] = $plugin;
 			sort($current);
 			update_option('active_plugins', $current);
-			include(ABSPATH . PLUGINDIR . '/' . trim( $_GET['plugin'] ));
-			do_action('activate_' . trim( $_GET['plugin'] ));
+			include(ABSPATH . PLUGINDIR . '/' . $plugin);
+			do_action('activate_' . $plugin);
 		}
 		wp_redirect('plugins.php?activate=true');
 	} else if ('deactivate' == $_GET['action']) {
@@ -110,7 +115,7 @@ if (empty($plugins)) {
 		$plugin_data['Description'] = wp_kses($plugin_data['Description'], array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()) ); ;
 		if ( $style != '' )
 			$style = 'class="' . $style . '"';
-		if ( is_writable(ABSPATH . PLUGINDIR . '/' . $plugin_file) )
+		if ( is_writable(ABSPATH . 'wp-content/plugins/' . $plugin_file) )
 			$edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
 		else
 			$edit = '';
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 9c93695..31d16bd 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -15,7 +15,7 @@ case 'post':
 	$parent_file = 'post-new.php';
 	$submenu_file = 'post-new.php';
 	check_admin_referer('add-post');
-	
+
 	$post_ID = 'post' == $action ? write_post() : edit_post();
 
 	// Redirect.
@@ -89,7 +89,7 @@ case 'editattachment':
 case 'editpost':
 	$post_ID = (int) $_POST['post_ID'];
 	check_admin_referer('update-post_' . $post_ID);
-	
+
 	$post_ID = edit_post();
 
 	if ( 'post' == $_POST['originalaction'] ) {
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index f1c38b4..6c96230 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 require_once('admin.php');
 
 $title = __('Profile');
@@ -30,13 +30,14 @@ $bookmarklet_height= 440;
 
 <h3><?php _e('Personal Options'); ?></h3>
 
+<?php if ( rich_edit_exists() ) : // don't bother showing the option if the editor has been removed ?>
 <p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
 <?php _e('Use the visual editor when writing') ?></label></p>
+<?php endif; ?>
 
 <?php do_action('profile_personal_options'); ?>
 
 <p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
-<div style="clear: both"></div>
 
 <fieldset>
 <legend><?php _e('Name'); ?></legend>
@@ -120,13 +121,13 @@ if ( $show_password_fields ) :
 
 <br clear="all" />
 
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
-    <?php
-    if(count($profileuser->caps) > count($profileuser->roles)):
-    ?>
-    <tr>
-      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
-      <td><?php 
+	<table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
+		<?php
+		if(count($profileuser->caps) > count($profileuser->roles)):
+		?>
+		<tr>
+			<th scope="row"><?php _e('Additional Capabilities:') ?></th>
+			<td><?php
 			$output = '';
 			foreach($profileuser->caps as $cap => $value) {
 				if(!$wp_roles->is_role($cap)) {
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index d25c58b..17846d6 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -3,7 +3,7 @@ die();
 define('WP_INSTALLING', true);
 
 if (!file_exists('../wp-config-sample.php'))
-    die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
+	die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
 
 $configFile = file('../wp-config-sample.php');
 
@@ -83,103 +83,103 @@ if (file_exists('../wp-config.php'))
 
 switch($step) {
 	case 0:
-?> 
-
-<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p> 
-<ol> 
-  <li>Database name</li> 
-  <li>Database username</li> 
-  <li>Database password</li>
-  <li>Database host</li> 
-  <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
-</ol> 
+?>
+
+<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
+<ol>
+	<li>Database name</li>
+	<li>Database username</li>
+	<li>Database password</li>
+	<li>Database host</li>
+	<li>Table prefix (if you want to run more than one WordPress in a single database) </li>
+</ol>
 <p><strong>If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p>
 <p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready, <a href="setup-config.php?step=1">let&#8217;s go</a>! </p>
 <?php
 	break;
 
 	case 1:
-	?> 
-</p> 
+	?>
+</p>
 <form method="post" action="setup-config.php?step=2">
-  <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
-  <table> 
-    <tr> 
-      <th scope="row">Database Name</th> 
-      <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
-      <td>The name of the database you want to run WP in. </td> 
-    </tr> 
-    <tr> 
-      <th scope="row">User Name</th> 
-      <td><input name="uname" type="text" size="25" value="username" /></td>
-      <td>Your MySQL username</td> 
-    </tr> 
-    <tr> 
-      <th scope="row">Password</th> 
-      <td><input name="pwd" type="text" size="25" value="password" /></td>
-      <td>...and MySQL password.</td> 
-    </tr> 
-    <tr> 
-      <th scope="row">Database Host</th> 
-      <td><input name="dbhost" type="text" size="25" value="localhost" /></td>
-      <td>99% chance you won't need to change this value.</td> 
-    </tr>
-    <tr>
-      <th scope="row">Table Prefix</th>
-      <td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
-      <td>If you want to run multiple WordPress installations in a single database, change this.</td>
-    </tr> 
-  </table>
-  <h2 class="step">
-  <input name="submit" type="submit" value="Submit" />
-  </h2>
-</form> 
+	<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
+	<table>
+		<tr>
+			<th scope="row">Database Name</th>
+			<td><input name="dbname" type="text" size="25" value="wordpress" /></td>
+			<td>The name of the database you want to run WP in. </td>
+		</tr>
+		<tr>
+			<th scope="row">User Name</th>
+			<td><input name="uname" type="text" size="25" value="username" /></td>
+			<td>Your MySQL username</td>
+		</tr>
+		<tr>
+			<th scope="row">Password</th>
+			<td><input name="pwd" type="text" size="25" value="password" /></td>
+			<td>...and MySQL password.</td>
+		</tr>
+		<tr>
+			<th scope="row">Database Host</th>
+			<td><input name="dbhost" type="text" size="25" value="localhost" /></td>
+			<td>99% chance you won't need to change this value.</td>
+		</tr>
+		<tr>
+			<th scope="row">Table Prefix</th>
+			<td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
+			<td>If you want to run multiple WordPress installations in a single database, change this.</td>
+		</tr>
+	</table>
+	<h2 class="step">
+	<input name="submit" type="submit" value="Submit" />
+	</h2>
+</form>
 <?php
 	break;
 
 	case 2:
 	$dbname  = trim($_POST['dbname']);
-    $uname   = trim($_POST['uname']);
-    $passwrd = trim($_POST['pwd']);
-    $dbhost  = trim($_POST['dbhost']);
+	$uname   = trim($_POST['uname']);
+	$passwrd = trim($_POST['pwd']);
+	$dbhost  = trim($_POST['dbhost']);
 	$prefix  = trim($_POST['prefix']);
 	if (empty($prefix)) $prefix = 'wp_';
 
-    // Test the db connection.
-    define('DB_NAME', $dbname);
-    define('DB_USER', $uname);
-    define('DB_PASSWORD', $passwrd);
-    define('DB_HOST', $dbhost);
+	// Test the db connection.
+	define('DB_NAME', $dbname);
+	define('DB_USER', $uname);
+	define('DB_PASSWORD', $passwrd);
+	define('DB_HOST', $dbhost);
 
-    // We'll fail here if the values are no good.
-    require_once('../wp-includes/wp-db.php');
+	// We'll fail here if the values are no good.
+	require_once('../wp-includes/wp-db.php');
 	$handle = fopen('../wp-config.php', 'w');
 
-    foreach ($configFile as $line_num => $line) {
-        switch (substr($line,0,16)) {
-            case "define('DB_NAME'":
-                fwrite($handle, str_replace("wordpress", $dbname, $line));
-                break;
-            case "define('DB_USER'":
-                fwrite($handle, str_replace("'username'", "'$uname'", $line));
-                break;
-            case "define('DB_PASSW":
-                fwrite($handle, str_replace("'password'", "'$passwrd'", $line));
-                break;
-            case "define('DB_HOST'":
-                fwrite($handle, str_replace("localhost", $dbhost, $line));
-                break;
+	foreach ($configFile as $line_num => $line) {
+		switch (substr($line,0,16)) {
+			case "define('DB_NAME'":
+				fwrite($handle, str_replace("wordpress", $dbname, $line));
+				break;
+			case "define('DB_USER'":
+				fwrite($handle, str_replace("'username'", "'$uname'", $line));
+				break;
+			case "define('DB_PASSW":
+				fwrite($handle, str_replace("'password'", "'$passwrd'", $line));
+				break;
+			case "define('DB_HOST'":
+				fwrite($handle, str_replace("localhost", $dbhost, $line));
+				break;
 			case '$table_prefix  =':
 				fwrite($handle, str_replace('wp_', $prefix, $line));
 				break;
-            default:
-                fwrite($handle, $line);
-        }
-    }
-    fclose($handle);
+			default:
+				fwrite($handle, $line);
+		}
+	}
+	fclose($handle);
 	chmod('../wp-config.php', 0666);
-?> 
-<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p> 
+?>
+<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p>
 <?php
 	break;
 }
diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php
index 256c1a2..a2ea264 100644
--- a/wp-admin/sidebar.php
+++ b/wp-admin/sidebar.php
@@ -34,15 +34,15 @@ form {
 	padding: 3px;
 }
 .sidebar-categories {
-    display: block;
-    height: 6.6em;
-    overflow: auto;
-    background-color: #f4f4f4;
+	display: block;
+	height: 6.6em;
+	overflow: auto;
+	background-color: #f4f4f4;
 }
 .sidebar-categories label {
 	font-size: 10px;
-    display: block;
-    width: 90%;
+	display: block;
+	width: 90%;
 }
 </style>
 </head>
@@ -65,9 +65,9 @@ Post:
 <textarea rows="8" cols="12" style="width: 100%" name="content" tabindex="2"></textarea>
 </p>
 <p>
-    <input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="Save as Draft" /> 
+	<input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="Save as Draft" />
 <?php if ( current_user_can('publish_posts') ) : ?>
-    <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="Publish" /> 
+	<input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="Publish" />
 <?php endif; ?>
 </p>
 </div>
diff --git a/wp-admin/templates.php b/wp-admin/templates.php
index 3608371..b38465b 100644
--- a/wp-admin/templates.php
+++ b/wp-admin/templates.php
@@ -83,7 +83,7 @@ default:
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 	<?php endif; ?>
 <?php endif; ?>
- <div class="wrap"> 
+ <div class="wrap">
 <?php
 if (is_writeable($real_file)) {
 	echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), wp_specialchars($file) ) . '</h2>';
@@ -92,14 +92,14 @@ if (is_writeable($real_file)) {
 }
 ?>
 <div id="templateside">
-<?php 
-if ( $recents ) : 
+<?php
+if ( $recents ) :
 ?>
 <h3><?php _e('Recent'); ?></h3>
 <?php
 echo '<ol>';
 foreach ($recents as $recent) :
-	echo "<li><a href='templates.php?file=$recent'>" . get_file_description(basename($recent)) . "</a></li>";
+	echo "<li><a href='templates.php?file=" . wp_specialchars($recent, true) . "'>" . get_file_description(basename($recent)) . "</a></li>";
 endforeach;
 echo '</ol>';
 endif;
@@ -111,21 +111,21 @@ endif;
 	 if (file_exists(ABSPATH . $old_file))
 		 $common_files[] = $old_file;
  } ?>
-  <ul>
-	 <?php foreach ($common_files as $common_file) : ?>
-	  <li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
-	 <?php endforeach; ?>
-  </ul>
+<ul>
+	<?php foreach ($common_files as $common_file) : ?>
+		<li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
+	<?php endforeach; ?>
+</ul>
 </div>
 <?php if (!$error) { ?>
-  <form name="template" id="template" action="templates.php" method="post"> 
-  <?php wp_nonce_field('edit-file_' . $file) ?>
-     <div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-</div>
+	<form name="template" id="template" action="templates.php" method="post">
+	<?php wp_nonce_field('edit-file_' . $file) ?>
+		<div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea>
+		<input type="hidden" name="action" value="update" />
+		<input type="hidden" name="file" value="<?php echo $file ?>" />
+		</div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
+	<p class="submit">
 <?php
 	echo "<input type='submit' name='submit' value='	" . __('Update File &raquo;') . "' tabindex='2' />";
 ?>
@@ -133,8 +133,8 @@ endif;
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+	</form>
+	<?php
 	} else {
 		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
 	}
@@ -144,14 +144,14 @@ endif;
 <div class="wrap">
 <h2><?php _e('Other Files') ?></h2>
 
-  <p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p> 
-  <form name="file" action="templates.php" method="get"> 
-    <input type="text" name="file" /> 
-    <input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" /> 
-  </form> 
+	<p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p>
+	<form name="file" action="templates.php" method="get">
+		<input type="text" name="file" />
+		<input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" />
+	</form>
 
-  <p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
-</div> 
+	<p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
+</div>
 <?php
 
 break;
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 90bae60..6dc6ec3 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -81,7 +81,7 @@ default:
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif; ?>
  <div class="wrap">
-  <form name="theme" action="theme-editor.php" method="post"> 
+	<form name="theme" action="theme-editor.php" method="post">
 		<?php _e('Select theme to edit:') ?>
 		<select name="theme" id="theme">
 	<?php
@@ -107,30 +107,30 @@ default:
 	}
 	?>
 	<div id="templateside">
-  <h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
+	<h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
 
 <?php
 if ($allowed_files) :
 ?>
-  <ul>
+	<ul>
 <?php foreach($allowed_files as $allowed_file) : ?>
 		 <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo get_file_description($allowed_file); ?></a></li>
 <?php endforeach; ?>
-  </ul>
+	</ul>
 <?php endif; ?>
-</div> 
+</div>
 	<?php
 	if (!$error) {
-	?> 
-  <form name="template" id="template" action="theme-editor.php" method="post">
-  <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
-		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-     <input type="hidden" name="theme" value="<?php echo $theme ?>" />
+	?>
+	<form name="template" id="template" action="theme-editor.php" method="post">
+	<?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
+		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+		 <input type="hidden" name="action" value="update" />
+		 <input type="hidden" name="file" value="<?php echo $file ?>" />
+		 <input type="hidden" name="theme" value="<?php echo $theme ?>" />
 		 </div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
+	<p class="submit">
 <?php
 	echo "<input type='submit' name='submit' value='	" . __('Update File &raquo;') . "' tabindex='2' />";
 ?>
@@ -138,16 +138,16 @@ if ($allowed_files) :
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+	</form>
+	<?php
 	} else {
 		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
 	}
 	?>
 <div class="clear"> &nbsp; </div>
-</div> 
+</div>
 <?php
 break;
 }
 
-include("admin-footer.php") ?> 
+include("admin-footer.php") ?>
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 9f6d7b5..ee244db 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -138,10 +138,10 @@ if ( is_site_admin() && count($broken_themes) ) {
 
 		$theme = ('class="alternate"' == $theme) ? '' : 'class="alternate"';
 		echo "
-	  <tr $theme>
-	     <td>$title</td>
-	     <td>$description</td>
-	  </tr>";
+		<tr $theme>
+			 <td>$title</td>
+			 <td>$description</td>
+		</tr>";
 	}
 ?>
 </table>
diff --git a/wp-admin/update-links.php b/wp-admin/update-links.php
index 0ecbdd3..2482deb 100644
--- a/wp-admin/update-links.php
+++ b/wp-admin/update-links.php
@@ -28,13 +28,13 @@ if ( false !== ( $fs = @fsockopen('api.pingomatic.com', 80, $errno, $errstr, 5)
 	while ( !feof($fs) )
 		$response .= fgets($fs, 1160); // One TCP-IP packet
 	fclose($fs);
-    
+
 	$response = explode("\r\n\r\n", $response, 2);
 	$body = trim( $response[1] );
 	$body = str_replace(array("\r\n", "\r"), "\n", $body);
-    
+
 	$returns = explode("\n", $body);
-    
+
 	foreach ($returns as $return) :
 		$time = $wpdb->escape( substr($return, 0, 19) );
 		$uri = $wpdb->escape( preg_replace('/(.*?) | (.*?)/', '$2', $return) );
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 4884f7d..1c8c8fd 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -120,7 +120,7 @@ We hope you enjoy your new weblog. Thanks!
 http://wordpress.org/
 "), $blog_url, $name, $password);
 
-	@wp_mail($email, __('New WordPress Blog'), $message, $message_headers);	
+	@wp_mail($email, __('New WordPress Blog'), $message, $message_headers);
 }
 endif;
 
@@ -137,7 +137,7 @@ function wp_upgrade() {
 	wp_cache_flush();
 	make_db_current_silent();
 	upgrade_all();
-	wp_cache_flush();	
+	wp_cache_flush();
 }
 endif;
 
@@ -187,7 +187,7 @@ function upgrade_100() {
 	$posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
 	if ($posts) {
 		foreach($posts as $post) {
-			if ('' == $post->post_name) { 
+			if ('' == $post->post_name) {
 				$newtitle = sanitize_title($post->post_title);
 				$wpdb->query("UPDATE $wpdb->posts SET post_name = '$newtitle' WHERE ID = '$post->ID'");
 			}
@@ -196,7 +196,7 @@ function upgrade_100() {
 
 	$categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
 	foreach ($categories as $category) {
-		if ('' == $category->category_nicename) { 
+		if ('' == $category->category_nicename) {
 			$newtitle = sanitize_title($category->cat_name);
 			$wpdb->query("UPDATE $wpdb->categories SET category_nicename = '$newtitle' WHERE cat_ID = '$category->cat_ID'");
 		}
@@ -251,19 +251,19 @@ function upgrade_101() {
 function upgrade_110() {
 	global $wpdb;
 
-    // Set user_nicename.
+	// Set user_nicename.
 	$users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
- 	foreach ($users as $user) {
- 		if ('' == $user->user_nicename) { 
- 			$newname = sanitize_title($user->user_nickname);
- 			$wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
- 		}
- 	}
+	foreach ($users as $user) {
+		if ('' == $user->user_nicename) {
+			$newname = sanitize_title($user->user_nickname);
+			$wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
+		}
+	}
 
 	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
 	foreach ($users as $row) {
 		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			   $wpdb->query('UPDATE '.$wpdb->users.' SET user_pass = MD5(\''.$row->user_pass.'\') WHERE ID = \''.$row->ID.'\'');
+			$wpdb->query('UPDATE '.$wpdb->users.' SET user_pass = MD5(\''.$row->user_pass.'\') WHERE ID = \''.$row->ID.'\'');
 		}
 	}
 
@@ -305,57 +305,57 @@ function upgrade_110() {
 }
 
 function upgrade_130() {
-    global $wpdb;
+	global $wpdb;
 
-    // Remove extraneous backslashes.
+	// Remove extraneous backslashes.
 	$posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
 	if ($posts) {
 		foreach($posts as $post) {
-            $post_content = addslashes(deslash($post->post_content));
-            $post_title = addslashes(deslash($post->post_title));
-            $post_excerpt = addslashes(deslash($post->post_excerpt));
+			$post_content = addslashes(deslash($post->post_content));
+			$post_title = addslashes(deslash($post->post_title));
+			$post_excerpt = addslashes(deslash($post->post_excerpt));
 			if ( empty($post->guid) )
 				$guid = get_permalink($post->ID);
 			else
 				$guid = $post->guid;
 
-            $wpdb->query("UPDATE $wpdb->posts SET post_title = '$post_title', post_content = '$post_content', post_excerpt = '$post_excerpt', guid = '$guid' WHERE ID = '$post->ID'");
+			$wpdb->query("UPDATE $wpdb->posts SET post_title = '$post_title', post_content = '$post_content', post_excerpt = '$post_excerpt', guid = '$guid' WHERE ID = '$post->ID'");
 		}
 	}
 
-    // Remove extraneous backslashes.
+	// Remove extraneous backslashes.
 	$comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
 	if ($comments) {
 		foreach($comments as $comment) {
-            $comment_content = addslashes(deslash($comment->comment_content));
-            $comment_author = addslashes(deslash($comment->comment_author));
-            $wpdb->query("UPDATE $wpdb->comments SET comment_content = '$comment_content', comment_author = '$comment_author' WHERE comment_ID = '$comment->comment_ID'");
+			$comment_content = addslashes(deslash($comment->comment_content));
+			$comment_author = addslashes(deslash($comment->comment_author));
+			$wpdb->query("UPDATE $wpdb->comments SET comment_content = '$comment_content', comment_author = '$comment_author' WHERE comment_ID = '$comment->comment_ID'");
 		}
 	}
 
-    // Remove extraneous backslashes.
+	// Remove extraneous backslashes.
 	$links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
 	if ($links) {
 		foreach($links as $link) {
-            $link_name = addslashes(deslash($link->link_name));
-            $link_description = addslashes(deslash($link->link_description));
-            $wpdb->query("UPDATE $wpdb->links SET link_name = '$link_name', link_description = '$link_description' WHERE link_id = '$link->link_id'");
+			$link_name = addslashes(deslash($link->link_name));
+			$link_description = addslashes(deslash($link->link_description));
+			$wpdb->query("UPDATE $wpdb->links SET link_name = '$link_name', link_description = '$link_description' WHERE link_id = '$link->link_id'");
 		}
 	}
 
-    // The "paged" option for what_to_show is no more.
-    if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
-        $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
-    }
+	// The "paged" option for what_to_show is no more.
+	if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
+		$wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
+	}
 
-		$active_plugins = __get_option('active_plugins');
+	$active_plugins = __get_option('active_plugins');
 
-		// If plugins are not stored in an array, they're stored in the old
-		// newline separated format.  Convert to new format.
-		if ( !is_array( $active_plugins ) ) {
-			$active_plugins = explode("\n", trim($active_plugins));
-			update_option('active_plugins', $active_plugins);
-		}
+	// If plugins are not stored in an array, they're stored in the old
+	// newline separated format.  Convert to new format.
+	if ( !is_array( $active_plugins ) ) {
+		$active_plugins = explode("\n", trim($active_plugins));
+		update_option('active_plugins', $active_plugins);
+	}
 
 	// Obsolete tables
 	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
@@ -508,7 +508,7 @@ function upgrade_210() {
 		// Give future posts a post_status of future.
 		$now = gmdate('Y-m-d H:i:59');
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
-		
+
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
 		if ( !empty($posts) )
 			foreach ( $posts as $post )
@@ -517,7 +517,7 @@ function upgrade_210() {
 	if ( $wp_current_db_version < 3570 ) {
 		// Create categories for link categories if a category with the same
 		// name doesn't exist.  Create a map of link cat IDs to cat IDs.
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");	
+		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");
 		foreach ( $link_cats as $link_cat) {
 			if ( $cat_id = category_exists($link_cat->cat_name) ) {
 				$link_cat_id_map[$link_cat->cat_id] = $cat_id;
@@ -536,9 +536,9 @@ function upgrade_210() {
 			if (!$cat && 0 != $link->link_category) {
 				$wpdb->query("INSERT INTO $wpdb->link2cat (link_id, category_id)
 					VALUES ('$link->link_id', '$link_cat')");
-			}			
+			}
 		}
-		
+
 		// Set default to the last category we grabbed during the upgrade loop.
 		update_option('default_link_category', $default_link_cat);
 
@@ -557,21 +557,21 @@ function upgrade_210() {
 
 // General
 function maybe_create_table($table_name, $create_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    return false;
+	global $wpdb;
+	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+		if ($table == $table_name) {
+			return true;
+		}
+	}
+	//didn't find it try to create it.
+	$q = $wpdb->query($create_ddl);
+	// we cannot directly tell that whether this succeeded!
+	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+		if ($table == $table_name) {
+			return true;
+		}
+	}
+	return false;
 }
 
 function drop_index($table, $index) {
@@ -600,22 +600,22 @@ function add_clean_index($table, $index) {
  **           false on error
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-    global $wpdb, $debug;
-    foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-        if ($debug) echo("checking $column == $column_name<br />");
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    return false;
+	global $wpdb, $debug;
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+		if ($debug) echo("checking $column == $column_name<br />");
+		if ($column == $column_name) {
+			return true;
+		}
+	}
+	//didn't find it try to create it.
+	$q = $wpdb->query($create_ddl);
+	// we cannot directly tell that whether this succeeded!
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+		if ($column == $column_name) {
+			return true;
+		}
+	}
+	return false;
 }
 
 
@@ -624,7 +624,7 @@ function get_alloptions_110() {
 	global $wpdb;
 	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
 		foreach ($options as $option) {
-			// "When trying to design a foolproof system, 
+			// "When trying to design a foolproof system,
 			//  never underestimate the ingenuity of the fools :)" -- Dougal
 			if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
 			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
@@ -655,20 +655,20 @@ function __get_option($setting) {
 }
 
 function deslash($content) {
-    // Note: \\\ inside a regex denotes a single backslash.
+	// Note: \\\ inside a regex denotes a single backslash.
 
-    // Replace one or more backslashes followed by a single quote with
-    // a single quote.
-    $content = preg_replace("/\\\+'/", "'", $content);
+	// Replace one or more backslashes followed by a single quote with
+	// a single quote.
+	$content = preg_replace("/\\\+'/", "'", $content);
 
-    // Replace one or more backslashes followed by a double quote with
-    // a double quote.
-    $content = preg_replace('/\\\+"/', '"', $content);
+	// Replace one or more backslashes followed by a double quote with
+	// a double quote.
+	$content = preg_replace('/\\\+"/', '"', $content);
 
-    // Replace one or more backslashes with one backslash.
-    $content = preg_replace("/\\\+/", "\\", $content);
+	// Replace one or more backslashes with one backslash.
+	$content = preg_replace("/\\\+/", "\\", $content);
 
-    return $content;
+	return $content;
 }
 
 function dbDelta($queries, $execute = true) {
@@ -835,7 +835,7 @@ function dbDelta($queries, $execute = true) {
 								$index_columns .= '('.$column_data['subpart'].')';
 							}
 						}
-						// Add the column list to the index create string 
+						// Add the column list to the index create string
 						$index_string .= ' ('.$index_columns.')';
 
 						if(!(($aindex = array_search($index_string, $indices)) === false)) {
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index 1875545..2e2cb1a 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -300,7 +300,7 @@ function populate_options() {
 		add_option('uploads_use_yearmonth_folders', 1);
 		add_option('upload_path', 'wp-content/uploads');
 	}
-	
+
 	// 2.0.3
 	add_option('secret', md5(uniqid(microtime())));
 
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index c0a4f7e..e44f07a 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -61,6 +61,6 @@ switch($step) {
 <?php
 		break;
 }
-?> 
+?>
 </body>
 </html>
diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php
index 623daeb..3900c6e 100644
--- a/wp-admin/upload-functions.php
+++ b/wp-admin/upload-functions.php
@@ -13,9 +13,9 @@ function wp_upload_display( $dims = false, $href = '' ) {
 	
 	$class = 'text';
 	$innerHTML = get_attachment_innerHTML( $id, false, $dims );
-	if ( $image_src = strstr($innerHTML, 'src="') ) {
-		$image_src = explode('"', $image_src);
-		$image_src = $image_src[1];
+	if ( $image_src = strstr($innerHTML, 'src=') ) {
+		preg_match("/src=(\"|')(.+?)\\1/", $image_src, $matches);
+		$image_src = $matches[2];
 		$image_rel = wp_make_link_relative($image_src);
 		$class = 'image';
 		$innerHTML = '&nbsp;' . str_replace($image_src, $image_rel, $innerHTML);
@@ -358,14 +358,15 @@ add_action( 'upload_files_browse-all', 'wp_upload_tab_browse_action' );
 
 function wp_upload_admin_head() {
 	global $wp_locale;
-	echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . "' type='text/css' />\n";
+	echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . "a' type='text/css' />\n";
 	if ( 'rtl' == $wp_locale->text_direction )
-		echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . "' type='text/css' />\n";
+		echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . "a' type='text/css' />\n";
 	if ( 'inline' == @$_GET['style'] ) {
-		echo "<style type='text/css'>\n";
-		echo "\tbody { height: 15em; overflow: hidden; }\n";
-		echo "\t#upload-content { overflow-y: auto; }\n";
-		echo "\t#upload-file { position: absolute; }\n";
+		echo "<style type='text/css' media='screen'>\n";
+		echo "\t#upload-menu { position: absolute; z-index: 2; }\n";
+		echo "\tbody > #upload-menu { position: fixed; }\n";
+		echo "\t#upload-content { top: 2em; }\n";
+		echo "\t#upload-file { position: absolute; top: 15px; }\n";
 		echo "</style>";
 	}
 }
diff --git a/wp-admin/upload-js.php b/wp-admin/upload-js.php
index c92439f..ca51e3f 100644
--- a/wp-admin/upload-js.php
+++ b/wp-admin/upload-js.php
@@ -74,7 +74,7 @@ addLoadEvent( function() {
 				params.action = '';
 				h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>&laquo; Back</a>";
 			} else {
-				h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files' class='back'>&laquo; Back</a>";
+				h += "<a href='#' onclick='return theFileList.cancelView();'  title='Browse your files' class='back'>&laquo; Back</a>";
 			}
 			h += "<div id='file-title'>"
 			if ( !this.currentImage.isImage )
@@ -82,7 +82,7 @@ addLoadEvent( function() {
 			else
 				h += "<h2>" + this.currentImage.title + "</h2>";
 			h += " &#8212; <span>";
-			h += "<a href='#' onclick='theFileList.editView(" + id + ")'>Edit</a>"
+			h += "<a href='#' onclick='return theFileList.editView(" + id + ");'>Edit</a>"
 			h += "</span>";
 			h += '</div>'
 			h += "<div id='upload-file-view' class='alignleft'>";
@@ -97,20 +97,20 @@ addLoadEvent( function() {
 			h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>";
 			h += "<table>";
 			if ( this.currentImage.thumb ) {
-				h += "<tr><th style='padding-bottom:.5em'>Show:</th><td style='padding-bottom:.5em'>";
-				h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> Thumbnail</label><br />";
-				h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> Full size</label>";
+				h += "<tr><th style='padding-bottom:.5em'><?php echo addslashes(__('Show:')); ?></th><td style='padding-bottom:.5em'>";
+				h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> <?php echo addslashes(__('Thumbnail')); ?></label><br />";
+				h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo addslashes(__('Full size')); ?></label>";
 				h += "</td></tr>";
 			}
 
-			h += "<tr><th>Link to:</th><td>";
-			h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> File</label><br />";
-			h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> Page</label><br />";
-			h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> None</label>";
+			h += "<tr><th><?php echo addslashes(__('Link to:')); ?></th><td>";
+			h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> <?php echo addslashes(__('File')); ?></label><br />";
+			h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> <?php echo addslashes(__('Page')); ?></label><br />";
+			h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> <?php echo addslashes(__('None')); ?></label>";
 			h += "</td></tr>";
 
 			h += "<tr><td colspan='2'><p class='submit'>";
-			h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='Send to editor &raquo;' />";
+			h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='<?php echo addslashes(__('Send to editor')); ?> &raquo;' />";
 			h += "</p></td></tr></table>";
 			h += "</form>";
 
@@ -136,7 +136,7 @@ addLoadEvent( function() {
 				params.action = '';
 				h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files' class='back'>&laquo; Back</a>";
 			} else {
-				h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files' class='back'>&laquo; Back</a>";
+				h += "<a href='#' onclick='return theFileList.cancelView();'  title='Browse your files' class='back'>&laquo; Back</a>";
 			}
 			h += "<div id='file-title'>"
 			if ( !this.currentImage.isImage )
@@ -144,7 +144,7 @@ addLoadEvent( function() {
 			else
 				h += "<h2>" + this.currentImage.title + "</h2>";
 			h += " &#8212; <span>";
-			h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>Insert</a>"
+			h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'>Insert</a>"
 			h += "</span>";
 			h += '</div>'
 			h += "<div id='upload-file-view' class='alignleft'>";
@@ -221,7 +221,7 @@ addLoadEvent( function() {
 				display = 'full';
 
 			if ( 'none' != link )
-				h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID + "'" ) ) + "' title='" + this.currentImage.title + "'>";
+				h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID ) ) + "' title='" + this.currentImage.title + "'>";
 			if ( display )
 				h += "<img src='" + ( 'thumb' == display ? ( this.currentImage.thumbBase + this.currentImage.thumb ) : ( this.currentImage.srcBase + this.currentImage.src ) ) + "' alt='" + this.currentImage.title + "' />";
 			else
@@ -233,9 +233,10 @@ addLoadEvent( function() {
 			if ( !win )
 				win = top;
 			tinyMCE = win.tinyMCE;
-			if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') )
-				win.tinyMCE.execCommand('mceInsertContent', false, h);
-			else
+			if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') ) {
+				tinyMCE.selectedInstance.getWin().focus();
+				tinyMCE.execCommand('mceInsertContent', false, h);
+			} else
 				win.edInsertContent(win.edCanvas, h);
 			if ( !this.ID )
 				this.cancelView();
@@ -243,7 +244,7 @@ addLoadEvent( function() {
 		},
 
 		deleteFile: function(id) {
-			if ( confirm("Are you sure you want to delete the file '" + this.currentImage.title + "'?\nClick ok to delete or cancel to go back.") ) {
+			if ( confirm("<?php printf(js_escape(__("Are you sure you want to delete the file '%s'?\nClick ok to delete or cancel to go back.")), '" + this.currentImage.title + "'); ?>") ) {
 				$('action-value').value = 'delete';
 				$('upload-file').submit();
 				return true;
diff --git a/wp-admin/upload-rtl.css b/wp-admin/upload-rtl.css
index a085c86..cf1a7c2 100644
--- a/wp-admin/upload-rtl.css
+++ b/wp-admin/upload-rtl.css
@@ -1,5 +1,16 @@
+#upload-menu li a.upload-tab-link {
+	float: right;
+	margin: 0 .75em 0 0;
+}
+
 table { float: right; }
 
+#upload-menu li #current-tab-nav {
+	float: right;
+	padding: 5px 0 0 5px;
+	margin-right: -5px;
+}
+
 #upload-file th, #the-attachment-links textarea { text-align: left; }
 
 h2 { margin: 0 0 0 .2em; }
@@ -9,12 +20,11 @@ h2 { margin: 0 0 0 .2em; }
 #upload-file-view { padding: 0 75px 0 0; }
 
 #upload-menu li {
-	margin: 0 .75em 0 0;
 	display: block;
 	float: right;
 }
 
-#upload-menu .current div {
+#upload-menu li.current {
 	border-right: 0;
 	border-left: 2px solid #448abd;
 }
diff --git a/wp-admin/upload.css b/wp-admin/upload.css
index 601f7e7..a74ec18 100644
--- a/wp-admin/upload.css
+++ b/wp-admin/upload.css
@@ -3,45 +3,60 @@ body { background: #f9fcfe; }
 .upload-file-data { display: none; }
 
 #upload-menu {
-	background: #247fab;
-	margin: 0px;
+	border-top: 2em solid #247fab;
+	margin: 0;
 	padding: 0;
+	height: 0;
 	list-style: none;
-	height: 2em;
-	border-bottom: 1px solid #448abd;
 	width: 100%;
 }
 
-#upload-menu li { margin: 0 0 0 .75em; }
+body > #upload-menu { border-bottom: 7px solid #fff; }
 
-#upload-menu li div {
-	padding: 5px;
+#upload-menu li {
+	margin: 0;
+	position: relative;
+	top: -2em;
+	padding-bottom: 5px;
+	border: none;
 	border-top: 3px solid #247fab;
 }
 
-#upload-menu li a {
+#upload-menu li a.upload-tab-link {
+	margin-left: 0.75em;
+	padding: 5px 5px 0;
+	display: block;
+	float: left;
+	height: 100%;
 	text-decoration: none;
 	border-bottom: none;
 	color: #fff;
 }
 
-#upload-menu li span a.page-numbers { color: #00019b; }
-
-#upload-menu .current div {
-	background: #f9fcfe;
+#upload-menu li.current {
 	border-right: 2px solid #448abd;
 	color: #000;
 }
 
-#upload-menu .current div a, #upload-menu div:hover a {
+#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover {
+	background: #f9fcfe;
 	color: #000;
 }
 
-#upload-menu div:hover {
-	background: #f9fcfe;
-	color: #000;
+#upload-menu li #current-tab-nav {
+	float: left;
+	padding: 5px 5px 0 0;
+	margin-left: -5px;
+}
+
+#upload-menu li span .page-numbers {
+	padding: 0;
+	border: none;
 }
 
+#upload-menu li span a.page-numbers { color: #00019b; }
+#upload-menu li span a.page-numbers:hover { text-decoration: underline; }
+
 #upload-content {
 	position: relative;
 	clear: both;
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index acf3a75..53d1e56 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -14,8 +14,6 @@ if ( !$tab )
 
 do_action( "upload_files_$tab" );
 
-add_action( 'admin_head', 'wp_upload_admin_head' );
-
 $pid = 0;
 if ( $post_id < 0 )
 	$pid = $post_id;
@@ -37,7 +35,7 @@ if ( $pid ) {
 
 	$wp_upload_tabs = array_merge($wp_upload_tabs, apply_filters( 'wp_upload_tabs', array() ));
 
-if ( !function_exists($wp_upload_tabs[$tab][2]) ) {
+if ( !is_callable($wp_upload_tabs[$tab][2]) ) {
 	$to_tab = isset($wp_upload_tabs['upload']) ? 'upload' : 'browse-all';
 	wp_redirect( add_query_arg( 'tab', $to_tab ) );
 	exit;
@@ -78,12 +76,12 @@ endif;
 
 echo "<ul id='upload-menu'>\n";
 foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the current_user_can check
-	$class = 'upload-tab';
 	$href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '', 'paged' => '') );
 	if ( isset($tab_array[4]) && is_array($tab_array[4]) )
 		add_query_arg( $tab_array[4], $href );
 	$_href = wp_specialchars( $href, 1 );
 	$page_links = '';
+	$class = 'upload-tab alignleft';
 	if ( $tab == $t ) {
 		$class .= ' current';
 		if ( $tab_array[3] ) {
@@ -107,7 +105,7 @@ foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the curr
 		}
 	}
 
-	echo "\t<li class='$class alignleft'><div><a href='$_href' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links</div></li>\n";
+	echo "\t<li class='$class'><a href='$_href' class='upload-tab-link' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links</li>\n";
 }
 unset($t, $tab_array, $href, $_href, $page_links, $total, $per, $class);
 echo "</ul>\n\n";
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index e1bdcc5..cc5d758 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -192,13 +192,13 @@ if ( $show_password_fields ) :
 <?php do_action('edit_user_profile'); ?>
 
 <br clear="all" />
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
-    <?php
-    if(count($profileuser->caps) > count($profileuser->roles)):
-    ?>
-    <tr>
-      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
-      <td><?php 
+	<table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
+		<?php
+		if(count($profileuser->caps) > count($profileuser->roles)):
+		?>
+		<tr>
+			<th scope="row"><?php _e('Additional Capabilities:') ?></th>
+			<td><?php
 			$output = '';
 			foreach($profileuser->caps as $cap => $value) {
 				if(!$wp_roles->is_role($cap)) {
@@ -208,15 +208,15 @@ if ( $show_password_fields ) :
 			}
 			echo $output;
 			?></td>
-    </tr>
-    <?php
-    endif;
-    ?>
-  </table>
+		</tr>
+		<?php
+		endif;
+		?>
+	</table>
 <p class="submit">
 	<input type="hidden" name="action" value="update" />
 	<input type="hidden" name="user_id" id="user_id" value="<?php echo $user_id; ?>" />
-    <input type="submit" value="<?php _e('Update User &raquo;') ?>" name="submit" />
+	<input type="submit" value="<?php _e('Update User &raquo;') ?>" name="submit" />
  </p>
 </form>
 </div>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 51e2b31..46ba6ca 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -123,6 +123,7 @@ case 'promote':
 
 	if (empty($_POST['users'])) {
 		wp_redirect($redirect);
+		exit();
 	}
 
 	if ( !current_user_can('edit_users') )
@@ -134,7 +135,7 @@ case 'promote':
 		if ( ! current_user_can('edit_user', $id) )
 			wp_die(__('You can&#8217;t edit that user.'));
 		// The new role of the current user must also have edit_users caps
-		if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
+		if($id == $current_user->ID && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
 			$update = 'err_admin_role';
 			continue;
 		}
@@ -144,6 +145,7 @@ case 'promote':
 	}
 
 	wp_redirect(add_query_arg('update', $update, $redirect));
+	exit();
 
 break;
 
@@ -153,6 +155,7 @@ case 'dodelete':
 
 	if ( empty($_POST['users']) ) {
 		wp_redirect($redirect);
+		exit();
 	}
 
 	if ( !current_user_can('delete_users') )
@@ -166,7 +169,7 @@ case 'dodelete':
 		if ( ! current_user_can('delete_user', $id) )
 			wp_die(__('You can&#8217;t delete that user.'));
 
-		if($id == $current_user->id) {
+		if($id == $current_user->ID) {
 			$update = 'err_admin_del';
 			continue;
 		}
@@ -181,9 +184,9 @@ case 'dodelete':
 		++$delete_count;
 	}
 
-	$redirect = add_query_arg('delete_count', $delete_count, $redirect);
-
-	wp_redirect(add_query_arg('update', $update, $redirect));
+	$redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
+	wp_redirect($redirect);
+	exit();
 
 break;
 
@@ -191,8 +194,10 @@ case 'delete':
 	wp_die(__('This function is disabled.'));
 	check_admin_referer('bulk-users');
 
-	if ( empty($_POST['users']) )
+	if ( empty($_POST['users']) ) {
 		wp_redirect($redirect);
+		exit();
+	}
 
 	if ( !current_user_can('delete_users') )
 		$errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
@@ -212,7 +217,7 @@ case 'delete':
 	$go_delete = false;
 	foreach ( (array) $userids as $id ) {
 		$user = new WP_User($id);
-		if ( $id == $current_user->id ) {
+		if ( $id == $current_user->ID ) {
 			echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
 		} else {
 			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
@@ -222,7 +227,7 @@ case 'delete':
 	$all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities' ORDER BY user_login");
 	$user_dropdown = '<select name="reassign_user">';
 	foreach ( (array) $all_logins as $login )
-		if ( $login->ID == $current_user->id || !in_array($login->ID, $userids) )
+		if ( $login->ID == $current_user->ID || !in_array($login->ID, $userids) )
 			$user_dropdown .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
 	$user_dropdown .= '</select>';
 	?>
@@ -329,8 +334,8 @@ case 'adduser':
 		$add_user_errors = $user_id;
 	else {
 		$new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_POST['user_login']), true));
-		$redirect = add_query_arg('usersearch', $new_user_login, $redirect);
-		wp_redirect(add_query_arg('update', $update, $redirect) . '#user-' . $user_id);
+		$redirect = add_query_arg( array('usersearch' => urlencode($new_user_login), 'update' => $update), $redirect );
+		wp_redirect( $redirect . '#user-' . $user_id );
 		die();
 	}
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 6fcffa8..010dc60 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -219,9 +219,8 @@ textarea, input, select {
 	border-style: none;
 	padding: 0px;
 	margin-bottom: 16px;
-	height: 17em;
+	height: 18em;
 	width: 100%;
-/*	overflow-y: hidden;*/
 }
 
 form#upload th {
@@ -297,7 +296,7 @@ form#upload #post_content {
 }
 
 .commentlist li {
-	border-bottom: 1px solid #ccc; 
+	border-bottom: 1px solid #ccc;
 	padding: 1em 1em .2em;
 	margin: 0;
 }
@@ -1006,8 +1005,8 @@ input.delete:hover {
 }
 
 /* A handy div class for hiding controls.
-   Some browsers will disable them when you
-   set display:none; */
+Some browsers will disable them when you
+set display:none; */
 .zerosize {
 	height: 0px;
 	width: 0px;
@@ -1047,9 +1046,9 @@ input.delete:hover {
 }
 
 /****************************************************************
-  avoid padding, margins or borders on dbx-box, 
-  to reduce visual discrepancies between it and the clone.  
-  overall, dbx-box is best left as visually unstyled as possible 
+avoid padding, margins or borders on dbx-box,
+to reduce visual discrepancies between it and the clone.
+overall, dbx-box is best left as visually unstyled as possible
 *****************************************************************/
 .dbx-box {
 	margin:0;
diff --git a/wp-admin/xfn.js b/wp-admin/xfn.js
index 3cdf608..9bcde19 100644
--- a/wp-admin/xfn.js
+++ b/wp-admin/xfn.js
@@ -10,10 +10,10 @@ function GetElementsWithClassName(elementName, className) {
 }
 
 function meChecked() {
-  var undefined;
-  var eMe = document.getElementById('me');
-  if (eMe == undefined) return false;
-  else return eMe.checked;
+	var undefined;
+	var eMe = document.getElementById('me');
+	if (eMe == undefined) return false;
+	else return eMe.checked;
 }
 
 function upit() {