X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..refs/tags/wordpress-3.0.5:/wp-admin/includes/template.php

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 79bc9900..fd7e76f9 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -8,215 +8,23 @@
  * @subpackage Administration
  */
 
-// Ugly recursive category stuff.
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $categories
- * @param unknown_type $page
- * @param unknown_type $per_page
- */
-function cat_rows( $parent = 0, $level = 0, $categories = 0, $page = 1, $per_page = 20 ) {
-
-	$count = 0;
-
-	if ( empty($categories) ) {
-
-		$args = array('hide_empty' => 0);
-		if ( !empty($_GET['s']) )
-			$args['search'] = $_GET['s'];
-
-		$categories = get_categories( $args );
-
-		if ( empty($categories) )
-			return false;
-	}
-
-	$children = _get_term_hierarchy('category');
-
-	_cat_rows( $parent, $level, $categories, $children, $page, $per_page, $count );
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $categories
- * @param unknown_type $count
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $page
- * @param unknown_type $per_page
- * @return unknown
- */
-function _cat_rows( $parent = 0, $level = 0, $categories, &$children, $page = 1, $per_page = 20, &$count ) {
-
-	$start = ($page - 1) * $per_page;
-	$end = $start + $per_page;
-	ob_start();
-
-	foreach ( $categories as $key => $category ) {
-		if ( $count >= $end )
-			break;
-
-		if ( $category->parent != $parent && empty($_GET['s']) )
-			continue;
-
-		// If the page starts in a subtree, print the parents.
-		if ( $count == $start && $category->parent > 0 ) {
-
-			$my_parents = array();
-			$p = $category->parent;
-			while ( $p ) {
-				$my_parent = get_category( $p );
-				$my_parents[] = $my_parent;
-				if ( $my_parent->parent == 0 )
-					break;
-				$p = $my_parent->parent;
-			}
-
-			$num_parents = count($my_parents);
-			while( $my_parent = array_pop($my_parents) ) {
-				echo "\t" . _cat_row( $my_parent, $level - $num_parents );
-				$num_parents--;
-			}
-		}
-
-		if ( $count >= $start )
-			echo "\t" . _cat_row( $category, $level );
-
-		unset( $categories[ $key ] );
-
-		$count++;
-
-		if ( isset($children[$category->term_id]) )
-			_cat_rows( $category->term_id, $level + 1, $categories, $children, $page, $per_page, $count );
-	}
-
-	$output = ob_get_contents();
-	ob_end_clean();
-
-	echo $output;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $category
- * @param unknown_type $level
- * @param unknown_type $name_override
- * @return unknown
- */
-function _cat_row( $category, $level, $name_override = false ) {
-	static $row_class = '';
-
-	$category = get_category( $category, OBJECT, 'display' );
-
-	$default_cat_id = (int) get_option( 'default_category' );
-	$pad = str_repeat( '— ', max(0, $level) );
-	$name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
-	$edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
-	if ( current_user_can( 'manage_categories' ) ) {
-		$edit = "<a class='row-title' href='$edit_link' title='" . esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $category->name)) . "'>" . esc_attr( $name ) . '</a><br />';
-		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-		if ( $default_cat_id != $category->term_id )
-			$actions['delete'] = "<a class='delete:the-list:cat-$category->term_id submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "'>" . __('Delete') . "</a>";
-		$actions = apply_filters('cat_row_actions', $actions, $category);
-		$action_count = count($actions);
-		$i = 0;
-		$edit .= '<div class="row-actions">';
-		foreach ( $actions as $action => $link ) {
-			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			$edit .= "<span class='$action'>$link$sep</span>";
-		}
-		$edit .= '</div>';
-	} else {
-		$edit = $name;
-	}
-
-	$row_class = 'alternate' == $row_class ? '' : 'alternate';
-	$qe_data = get_category_to_edit($category->term_id);
-
-	$category->count = number_format_i18n( $category->count );
-	$posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count;
-	$output = "<tr id='cat-$category->term_id' class='iedit $row_class'>";
-
-	$columns = get_column_headers('categories');
-	$hidden = get_hidden_columns('categories');
-	foreach ( $columns as $column_name => $column_display_name ) {
-		$class = "class=\"$column_name column-$column_name\"";
-
-		$style = '';
-		if ( in_array($column_name, $hidden) )
-			$style = ' style="display:none;"';
-
-		$attributes = "$class$style";
-
-		switch ($column_name) {
-			case 'cb':
-				$output .= "<th scope='row' class='check-column'>";
-				if ( $default_cat_id != $category->term_id ) {
-					$output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />";
-				} else {
-					$output .= "&nbsp;";
-				}
-				$output .= '</th>';
-				break;
-			case 'name':
-				$output .= "<td $attributes>$edit";
-				$output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-				$output .= '<div class="name">' . $qe_data->name . '</div>';
-				$output .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug) . '</div>';
-				$output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
-				break;
-			case 'description':
-				$output .= "<td $attributes>$category->description</td>";
-				break;
-			case 'slug':
-				$output .= "<td $attributes>" . apply_filters('editable_slug', $category->slug) . "</td>";
-				break;
-			case 'posts':
-				$attributes = 'class="posts column-posts num"' . $style;
-				$output .= "<td $attributes>$posts_count</td>\n";
-				break;
-			default:
-				$output .= "<td $attributes>";
-				$output .= apply_filters('manage_categories_custom_column', '', $column_name, $category->term_id);
-				$output .= "</td>";
-		}
-	}
-	$output .= '</tr>';
-
-	return $output;
-}
-
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.7
  *
- * Outputs the HTML for the hidden table rows used in Categories, Link Caregories and Tags quick edit.
+ * Outputs the HTML for the hidden table rows used in Categories, Link Categories and Tags quick edit.
  *
- * @param string $type "tag", "category" or "link-category"
+ * @param string $type "edit-tags", "categoried" or "edit-link-categories"
+ * @param string $taxonomy The taxonomy of the row.
  * @return
  */
-function inline_edit_term_row($type) {
+function inline_edit_term_row($type, $taxonomy) {
 
-	if ( ! current_user_can( 'manage_categories' ) )
+	$tax = get_taxonomy($taxonomy);
+	if ( ! current_user_can( $tax->cap->edit_terms ) )
 		return;
 
-	$is_tag = $type == 'edit-tags';
 	$columns = get_column_headers($type);
 	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
 	$col_count = count($columns) - count($hidden);
@@ -232,20 +40,12 @@ function inline_edit_term_row($type) {
 				<span class="title"><?php _e( 'Name' ); ?></span>
 				<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
 			</label>
-
+<?php if ( !is_multisite() ) { ?>
 			<label>
 				<span class="title"><?php _e( 'Slug' ); ?></span>
 				<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
 			</label>
-
-<?php if ( 'category' == $type ) : ?>
-
-			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
-				<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?>
-			</label>
-
-<?php endif; // $type ?>
+<?php } ?>
 
 		</div></fieldset>
 
@@ -256,18 +56,19 @@ function inline_edit_term_row($type) {
 	foreach ( $columns as $column_name => $column_display_name ) {
 		if ( isset( $core_columns[$column_name] ) )
 			continue;
-		do_action( 'quick_edit_custom_box', $column_name, $type );
+		do_action( 'quick_edit_custom_box', $column_name, $type, $taxonomy );
 	}
 
 ?>
 
 	<p class="inline-edit-save submit">
 		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-		<?php $update_text = ( $is_tag ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?>
+		<?php $update_text = $tax->labels->update_item; ?>
 		<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
-		<img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
+		<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
 		<span class="error" style="display:none;"></span>
 		<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
+		<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $tax->name ); ?>" />
 		<br class="clear" />
 	</p>
 	</td></tr>
@@ -371,81 +172,10 @@ function link_cat_row( $category, $name_override = false ) {
 	return $output;
 }
 
-/**
- * Outputs the html checked attribute.
- *
- * Compares the first two arguments and if identical marks as checked
- *
- * @since 1.0
- *
- * @param any $checked One of the values to compare
- * @param any $current (true) The other value to compare if not just true
- * @param bool $echo Whether or not to echo or just return the string
- */
-function checked( $checked, $current = true, $echo = true) {
-	return __checked_selected_helper( $checked, $current, $echo, 'checked' );
-}
-
-/**
- * Outputs the html selected attribute.
- *
- * Compares the first two arguments and if identical marks as selected
- *
- * @since 1.0
- *
- * @param any selected One of the values to compare
- * @param any $current (true) The other value to compare if not just true
- * @param bool $echo Whether or not to echo or just return the string
- */
-function selected( $selected, $current = true, $echo = true) {
-	return __checked_selected_helper( $selected, $current, $echo, 'selected' );
-}
-
-/**
- * Private helper function for checked and selected.
- *
- * Compares the first two arguments and if identical marks as $type
- *
- * @since 2.8
- * @access private
- *
- * @param any $helper One of the values to compare
- * @param any $current (true) The other value to compare if not just true
- * @param bool $echo Whether or not to echo or just return the string
- * @param string $type The type of checked|selected we are doing.
- */
-function __checked_selected_helper( $helper, $current, $echo, $type) {
-	if ( (string) $helper === (string) $current)
-		$result = " $type='$type'";
-	else
-		$result = '';
-
-	if ($echo)
-		echo $result;
-
-	return $result;
-}
-
 //
 // Category Checklists
 //
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- * @deprecated Use {@link wp_link_category_checklist()}
- * @see wp_link_category_checklist()
- *
- * @param unknown_type $default
- * @param unknown_type $parent
- * @param unknown_type $popular_ids
- */
-function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
-	global $post_ID;
-	wp_category_checklist($post_ID);
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -467,9 +197,16 @@ class Walker_Category_Checklist extends Walker {
 
 	function start_el(&$output, $category, $depth, $args) {
 		extract($args);
+		if ( empty($taxonomy) )
+			$taxonomy = 'category';
+
+		if ( $taxonomy == 'category' )
+			$name = 'post_category';
+		else
+			$name = 'tax_input['.$taxonomy.']';
 
 		$class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
-		$output .= "\n<li id='category-$category->term_id'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="post_category[]" id="in-category-' . $category->term_id . '"' . (in_array( $category->term_id, $selected_cats ) ? ' checked="checked"' : "" ) . '/> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
+		$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
 	}
 
 	function end_el(&$output, $category, $depth, $args) {
@@ -488,31 +225,62 @@ class Walker_Category_Checklist extends Walker {
  * @param unknown_type $popular_cats
  */
 function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
+	wp_terms_checklist($post_id,
+	 	array(
+			'taxonomy' => 'category',
+			'descendants_and_self' => $descendants_and_self,
+			'selected_cats' => $selected_cats,
+			'popular_cats' => $popular_cats,
+			'walker' => $walker,
+			'checked_ontop' => $checked_ontop
+  ));
+}
+
+/**
+ * Taxonomy independent version of wp_category_checklist
+ *
+ * @param int $post_id
+ * @param array $args
+ */
+function wp_terms_checklist($post_id = 0, $args = array()) {
+ 	$defaults = array(
+		'descendants_and_self' => 0,
+		'selected_cats' => false,
+		'popular_cats' => false,
+		'walker' => null,
+		'taxonomy' => 'category',
+		'checked_ontop' => true
+	);
+	extract( wp_parse_args($args, $defaults), EXTR_SKIP );
+
 	if ( empty($walker) || !is_a($walker, 'Walker') )
 		$walker = new Walker_Category_Checklist;
 
 	$descendants_and_self = (int) $descendants_and_self;
 
-	$args = array();
+	$args = array('taxonomy' => $taxonomy);
+
+	$tax = get_taxonomy($taxonomy);
+	$args['disabled'] = !current_user_can($tax->cap->assign_terms);
 
 	if ( is_array( $selected_cats ) )
 		$args['selected_cats'] = $selected_cats;
 	elseif ( $post_id )
-		$args['selected_cats'] = wp_get_post_categories($post_id);
+		$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 	else
 		$args['selected_cats'] = array();
 
 	if ( is_array( $popular_cats ) )
 		$args['popular_cats'] = $popular_cats;
 	else
-		$args['popular_cats'] = get_terms( 'category', array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
 
 	if ( $descendants_and_self ) {
-		$categories = get_categories( "child_of=$descendants_and_self&hierarchical=0&hide_empty=0" );
-		$self = get_category( $descendants_and_self );
+		$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
+		$self = get_term( $descendants_and_self, $taxonomy );
 		array_unshift( $categories, $self );
 	} else {
-		$categories = get_categories('get=all');
+		$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 	}
 
 	if ( $checked_ontop ) {
@@ -549,25 +317,31 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech
 	global $post_ID;
 
 	if ( $post_ID )
-		$checked_categories = wp_get_post_categories($post_ID);
+		$checked_terms = wp_get_object_terms($post_ID, $taxonomy, array('fields'=>'ids'));
 	else
-		$checked_categories = array();
+		$checked_terms = array();
 
-	$categories = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+
+	$tax = get_taxonomy($taxonomy);
+	if ( ! current_user_can($tax->cap->assign_terms) )
+		$disabled = 'disabled="disabled"';
+	else
+		$disabled = '';
 
 	$popular_ids = array();
-	foreach ( (array) $categories as $category ) {
-		$popular_ids[] = $category->term_id;
+	foreach ( (array) $terms as $term ) {
+		$popular_ids[] = $term->term_id;
 		if ( !$echo ) // hack for AJAX use
 			continue;
-		$id = "popular-category-$category->term_id";
-		$checked = in_array( $category->term_id, $checked_categories ) ? 'checked="checked"' : '';
+		$id = "popular-$taxonomy-$term->term_id";
+		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
 
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
-			<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $category->term_id; ?>" />
-				<?php echo esc_html( apply_filters( 'the_category', $category->name ) ); ?>
+			<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled ?>/>
+				<?php echo esc_html( apply_filters( 'the_category', $term->name ) ); ?>
 			</label>
 		</li>
 
@@ -576,21 +350,6 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech
 	return $popular_ids;
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- * @deprecated Use {@link wp_link_category_checklist()}
- * @see wp_link_category_checklist()
- *
- * @param unknown_type $default
- */
-function dropdown_link_categories( $default = 0 ) {
-	global $link_id;
-
-	wp_link_category_checklist($link_id);
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -602,26 +361,24 @@ function wp_link_category_checklist( $link_id = 0 ) {
 	$default = 1;
 
 	if ( $link_id ) {
-		$checked_categories = wp_get_link_cats($link_id);
-
-		if ( count( $checked_categories ) == 0 ) {
-			// No selected categories, strange
+		$checked_categories = wp_get_link_cats( $link_id );
+		// No selected categories, strange
+		if ( ! count( $checked_categories ) )
 			$checked_categories[] = $default;
-		}
 	} else {
 		$checked_categories[] = $default;
 	}
 
-	$categories = get_terms('link_category', 'orderby=count&hide_empty=0');
+	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
 
-	if ( empty($categories) )
+	if ( empty( $categories ) )
 		return;
 
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
-		$name = esc_html( apply_filters('the_category', $category->name));
-		$checked = in_array( $cat_id, $checked_categories );
-		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', ($checked ? ' checked="checked"' : "" ), '/> ', $name, "</label></li>";
+		$name = esc_html( apply_filters( 'the_category', $category->name ) );
+		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
 	}
 }
 
@@ -638,18 +395,36 @@ function wp_link_category_checklist( $link_id = 0 ) {
  * @param unknown_type $class
  * @return unknown
  */
-function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) {
+function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) {
+		global $post_type, $current_screen;
+		static $row_class = '';
+		$row_class = ($row_class == '' ? ' class="alternate"' : '');
+
 		$count = number_format_i18n( $tag->count );
-		$tagsel = ($taxonomy == 'post_tag' ? 'tag' : $taxonomy);
-		$count = ( $count > 0 ) ? "<a href='edit.php?$tagsel=$tag->slug'>$count</a>" : $count;
+		$tax = get_taxonomy($taxonomy);
+
+		if ( 'post_tag' == $taxonomy ) {
+			$tagsel = 'tag';
+		} elseif ( 'category' == $taxonomy ) {
+			$tagsel = 'category_name';
+		} elseif ( ! empty($tax->query_var) ) {
+			$tagsel = $tax->query_var;
+		} else {
+			$tagsel = $taxonomy;
+		}
 
-		$name = apply_filters( 'term_name', $tag->name );
+		$pad = str_repeat( '&#8212; ', max(0, $level) );
+		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
 		$qe_data = get_term($tag->term_id, $taxonomy, object, 'edit');
-		$edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id";
+		$edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
+
 		$out = '';
-		$out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>';
-		$columns = get_column_headers('edit-tags');
-		$hidden = get_hidden_columns('edit-tags');
+		$out .= '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
+
+
+		$columns = get_column_headers($current_screen);
+		$hidden = get_hidden_columns($current_screen);
+		$default_term = get_option('default_' . $taxonomy);
 		foreach ( $columns as $column_name => $column_display_name ) {
 			$class = "class=\"$column_name column-$column_name\"";
 
@@ -661,15 +436,24 @@ function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) {
 
 			switch ($column_name) {
 				case 'cb':
-					$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
+					if ( current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term )
+						$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
+					else
+						$out .= '<th scope="row" class="check-column">&nbsp;</th>';
 					break;
 				case 'name':
 					$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $name)) . '">' . $name . '</a></strong><br />';
 					$actions = array();
-					$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-					$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . "</a>";
+					if ( current_user_can($tax->cap->edit_terms) ) {
+						$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+						$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
+					}
+					if ( current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term )
+						$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . "</a>";
+
 					$actions = apply_filters('tag_row_actions', $actions, $tag);
+					$actions = apply_filters("${taxonomy}_row_actions", $actions, $tag);
+
 					$action_count = count($actions);
 					$i = 0;
 					$out .= '<div class="row-actions">';
@@ -681,7 +465,8 @@ function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) {
 					$out .= '</div>';
 					$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
 					$out .= '<div class="name">' . $qe_data->name . '</div>';
-					$out .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug) . '</div></div></td>';
+					$out .= '<div class="slug">' . apply_filters('editable_slug', $qe_data->slug) . '</div>';
+					$out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
 					break;
 				case 'description':
 					$out .= "<td $attributes>$tag->description</td>";
@@ -691,7 +476,7 @@ function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) {
 					break;
 				case 'posts':
 					$attributes = 'class="posts column-posts num"' . $style;
-					$out .= "<td $attributes>$count</td>";
+					$out .= "<td $attributes><a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a></td>";
 					break;
 				default:
 					$out .= "<td $attributes>";
@@ -700,7 +485,7 @@ function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) {
 			}
 		}
 
-		$out .= '</tr>';
+		$out .= "</tr>\n";
 
 		return $out;
 }
@@ -725,23 +510,84 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '', $taxonomy = 'po
 
 	$args = array('offset' => $start, 'number' => $pagesize, 'hide_empty' => 0);
 
-	if ( !empty( $searchterms ) ) {
+	if ( !empty( $searchterms ) )
 		$args['search'] = $searchterms;
-	}
-
-	$tags = get_terms( $taxonomy, $args );
 
 	// convert it to table rows
 	$out = '';
 	$count = 0;
-	foreach( $tags as $tag )
-		$out .= _tag_row( $tag, ++$count % 2 ? ' class="alternate"' : '', $taxonomy );
+	if ( is_taxonomy_hierarchical($taxonomy) ) {
+		// We'll need the full set of terms then.
+		$args['number'] = $args['offset'] = 0;
+
+		$terms = get_terms( $taxonomy, $args );
+		if ( !empty( $searchterms ) ) // Ignore children on searches.
+			$children = array();
+		else
+			$children = _get_term_hierarchy($taxonomy);
+
+		// Some funky recursion to get the job done(Paging & parents mainly) is contained within, Skip it for non-hierarchical taxonomies for performance sake
+		$out .= _term_rows($taxonomy, $terms, $children, $page, $pagesize, $count);
+	} else {
+		$terms = get_terms( $taxonomy, $args );
+		foreach( $terms as $term )
+			$out .= _tag_row( $term, 0, $taxonomy );
+		$count = $pagesize; // Only displaying a single page.
+	}
 
-	// filter and send to screen
 	echo $out;
 	return $count;
 }
 
+function _term_rows( $taxonomy, $terms, &$children, $page = 1, $per_page = 20, &$count, $parent = 0, $level = 0 ) {
+
+	$start = ($page - 1) * $per_page;
+	$end = $start + $per_page;
+
+	$output = '';
+	foreach ( $terms as $key => $term ) {
+
+		if ( $count >= $end )
+			break;
+
+		if ( $term->parent != $parent && empty($_GET['s']) )
+			continue;
+
+		// If the page starts in a subtree, print the parents.
+		if ( $count == $start && $term->parent > 0 && empty($_GET['s']) ) {
+			$my_parents = $parent_ids = array();
+			$p = $term->parent;
+			while ( $p ) {
+				$my_parent = get_term( $p, $taxonomy );
+				$my_parents[] = $my_parent;
+				$p = $my_parent->parent;
+				if ( in_array($p, $parent_ids) ) // Prevent parent loops.
+					break;
+				$parent_ids[] = $p;
+			}
+			unset($parent_ids);
+
+			$num_parents = count($my_parents);
+			while ( $my_parent = array_pop($my_parents) ) {
+				$output .=  "\t" . _tag_row( $my_parent, $level - $num_parents, $taxonomy );
+				$num_parents--;
+			}
+		}
+
+		if ( $count >= $start )
+			$output .= "\t" . _tag_row( $term, $level, $taxonomy );
+
+		++$count;
+
+		unset($terms[$key]);
+
+		if ( isset($children[$term->term_id]) && empty($_GET['s']) )
+			$output .= _term_rows( $taxonomy, $terms, $children, $page, $per_page, $count, $term->term_id, $level + 1 );
+	}
+
+	return $output;
+}
+
 // define the columns to display, the syntax is 'internal name' => 'display name'
 /**
  * {@internal Missing Short Description}}
@@ -750,19 +596,31 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '', $taxonomy = 'po
  *
  * @return unknown
  */
-function wp_manage_posts_columns() {
+function wp_manage_posts_columns( $screen = '') {
+	if ( empty($screen) )
+		$post_type = 'post';
+	else
+		$post_type = $screen->post_type;
+
 	$posts_columns = array();
 	$posts_columns['cb'] = '<input type="checkbox" />';
 	/* translators: manage posts column name */
-	$posts_columns['title'] = _x('Post', 'column name');
+	$posts_columns['title'] = _x('Title', 'column name');
 	$posts_columns['author'] = __('Author');
-	$posts_columns['categories'] = __('Categories');
-	$posts_columns['tags'] = __('Tags');
+	if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
+		$posts_columns['categories'] = __('Categories');
+	if ( empty($post_type) || is_object_in_taxonomy($post_type, 'post_tag') )
+		$posts_columns['tags'] = __('Tags');
 	$post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-	if ( !in_array( $post_status, array('pending', 'draft', 'future') ) )
-		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
+	if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
+		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
 	$posts_columns['date'] = __('Date');
-	$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
+
+	if ( 'page' == $post_type )
+		$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+	else
+		$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+	$posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
 
 	return $posts_columns;
 }
@@ -785,7 +643,7 @@ function wp_manage_media_columns() {
 	//$posts_columns['tags'] = _x('Tags', 'column name');
 	/* translators: column name */
 	$posts_columns['parent'] = _x('Attached to', 'column name');
-	$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
+	$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
 	//$posts_columns['comments'] = __('Comments');
 	/* translators: column name */
 	$posts_columns['date'] = _x('Date', 'column name');
@@ -802,46 +660,36 @@ function wp_manage_media_columns() {
  * @return unknown
  */
 function wp_manage_pages_columns() {
-	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
-	$posts_columns['title'] = __('Title');
-	$posts_columns['author'] = __('Author');
-	$post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-	if ( !in_array( $post_status, array('pending', 'draft', 'future') ) )
-		$posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.png" /></div>';
-	$posts_columns['date'] = __('Date');
-	$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
-
-	return $posts_columns;
+	return wp_manage_posts_columns();
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Get the column headers for a screen
  *
  * @since unknown
  *
- * @param unknown_type $page
- * @return unknown
+ * @param string|object $screen The screen you want the headers for
+ * @return array Containing the headers in the format id => UI String
  */
-function get_column_headers($page) {
+function get_column_headers($screen) {
 	global $_wp_column_headers;
 
 	if ( !isset($_wp_column_headers) )
 		$_wp_column_headers = array();
 
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
 	// Store in static to avoid running filters on each call
-	if ( isset($_wp_column_headers[$page]) )
-		return $_wp_column_headers[$page];
+	if ( isset($_wp_column_headers[$screen->id]) )
+		return $_wp_column_headers[$screen->id];
 
-	switch ($page) {
+	switch ($screen->base) {
 		case 'edit':
-			 $_wp_column_headers[$page] = wp_manage_posts_columns();
+			 $_wp_column_headers[$screen->id] = wp_manage_posts_columns( $screen );
 			 break;
-		case 'edit-pages':
-			$_wp_column_headers[$page] = wp_manage_pages_columns();
-			break;
 		case 'edit-comments':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'author' => __('Author'),
 				/* translators: column name */
@@ -852,7 +700,7 @@ function get_column_headers($page) {
 
 			break;
 		case 'link-manager':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
 				'url' => __('URL'),
@@ -864,10 +712,10 @@ function get_column_headers($page) {
 
 			break;
 		case 'upload':
-			$_wp_column_headers[$page] = wp_manage_media_columns();
+			$_wp_column_headers[$screen->id] = wp_manage_media_columns();
 			break;
 		case 'categories':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
 				'description' => __('Description'),
@@ -877,7 +725,7 @@ function get_column_headers($page) {
 
 			break;
 		case 'edit-link-categories':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
 				'description' => __('Description'),
@@ -887,7 +735,7 @@ function get_column_headers($page) {
 
 			break;
 		case 'edit-tags':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'name' => __('Name'),
 				'description' => __('Description'),
@@ -897,7 +745,7 @@ function get_column_headers($page) {
 
 			break;
 		case 'users':
-			$_wp_column_headers[$page] = array(
+			$_wp_column_headers[$screen->id] = array(
 				'cb' => '<input type="checkbox" />',
 				'username' => __('Username'),
 				'name' => __('Name'),
@@ -907,11 +755,11 @@ function get_column_headers($page) {
 			);
 			break;
 		default :
-			$_wp_column_headers[$page] = array();
+			$_wp_column_headers[$screen->id] = array();
 	}
 
-	$_wp_column_headers[$page] = apply_filters('manage_' . $page . '_columns', $_wp_column_headers[$page]);
-	return $_wp_column_headers[$page];
+	$_wp_column_headers[$screen->id] = apply_filters('manage_' . $screen->id . '_columns', $_wp_column_headers[$screen->id]);
+	return $_wp_column_headers[$screen->id];
 }
 
 /**
@@ -919,18 +767,16 @@ function get_column_headers($page) {
  *
  * @since unknown
  *
- * @param unknown_type $type
+ * @param unknown_type $screen
  * @param unknown_type $id
  */
-function print_column_headers( $type, $id = true ) {
-	$type = str_replace('.php', '', $type);
-	$columns = get_column_headers( $type );
-	$hidden = get_hidden_columns($type);
+function print_column_headers( $screen, $id = true ) {
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	$columns = get_column_headers( $screen );
+	$hidden = get_hidden_columns($screen);
 	$styles = array();
-//	$styles['tag']['posts'] = 'width: 90px;';
-//	$styles['link-category']['links'] = 'width: 90px;';
-//	$styles['category']['posts'] = 'width: 90px;';
-//	$styles['link']['visible'] = 'text-align: center;';
 
 	foreach ( $columns as $column_key => $column_display_name ) {
 		$class = ' class="manage-column';
@@ -948,8 +794,8 @@ function print_column_headers( $type, $id = true ) {
 		if ( in_array($column_key, $hidden) )
 			$style = 'display:none;';
 
-		if ( isset($styles[$type]) && isset($styles[$type][$column_key]) )
-			$style .= ' ' . $styles[$type][$column_key];
+		if ( isset($styles[$screen->id]) && isset($styles[$screen->id][$column_key]) )
+			$style .= ' ' . $styles[$screen>id][$column_key];
 		$style = ' style="' . $style . '"';
 ?>
 	<th scope="col" <?php echo $id ? "id=\"$column_key\"" : ""; echo $class; echo $style; ?>><?php echo $column_display_name; ?></th>
@@ -968,10 +814,13 @@ function print_column_headers( $type, $id = true ) {
 function register_column_headers($screen, $columns) {
 	global $_wp_column_headers;
 
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
 	if ( !isset($_wp_column_headers) )
 		$_wp_column_headers = array();
 
-	$_wp_column_headers[$screen] = $columns;
+	$_wp_column_headers[$screen->id] = $columns;
 }
 
 /**
@@ -979,11 +828,13 @@ function register_column_headers($screen, $columns) {
  *
  * @since unknown
  *
- * @param unknown_type $page
+ * @param unknown_type $screen
  */
-function get_hidden_columns($page) {
-	$page = str_replace('.php', '', $page);
-	return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false );
+function get_hidden_columns($screen) {
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	return (array) get_user_option( 'manage' . $screen->id. 'columnshidden' );
 }
 
 /**
@@ -993,43 +844,61 @@ function get_hidden_columns($page) {
  *
  * @since 2.7
  *
- * @param string $type 'post' or 'page'
+ * @param string $screen
  */
-function inline_edit_row( $type ) {
-	global $current_user, $mode;
+function inline_edit_row( $screen ) {
+	global $mode;
 
-	$is_page = 'page' == $type;
-	if ( $is_page ) {
-		$screen = 'edit-pages';
-		$post = get_default_page_to_edit();
-	} else {
-		$screen = 'edit';
-		$post = get_default_post_to_edit();
+	if ( is_string($screen) ) {
+		$screen = array('id' => 'edit-' . $screen, 'base' => 'edit', 'post_type' => $screen );
+		$screen = (object) $screen;
+	}
+
+	$post = get_default_post_to_edit( $screen->post_type );
+	$post_type_object = get_post_type_object( $screen->post_type );
+
+	$taxonomy_names = get_object_taxonomies( $screen->post_type );
+	$hierarchical_taxonomies = array();
+	$flat_taxonomies = array();
+	foreach ( $taxonomy_names as $taxonomy_name ) {
+		$taxonomy = get_taxonomy( $taxonomy_name);
+
+		if ( !$taxonomy->show_ui )
+			continue;
+
+		if ( $taxonomy->hierarchical )
+			$hierarchical_taxonomies[] = $taxonomy;
+		else
+			$flat_taxonomies[] = $taxonomy;
 	}
 
-	$columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
+	$columns = wp_manage_posts_columns($screen);
 	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
 	$col_count = count($columns) - count($hidden);
 	$m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-	$can_publish = current_user_can("publish_{$type}s");
+	$can_publish = current_user_can($post_type_object->cap->publish_posts);
 	$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
 
 ?>
 
 <form method="get" action=""><table style="display: none"><tbody id="inlineedit">
 	<?php
+	$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
 	$bulk = 0;
 	while ( $bulk < 2 ) { ?>
 
-	<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type ";
-		echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type";
+	<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
+		echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
 	?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
 
 	<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
-		<h4><?php echo $bulk ? ( $is_page ? __( 'Bulk Edit Pages' ) : __( 'Bulk Edit Posts' ) ) : __( 'Quick Edit' ); ?></h4>
+		<h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
 
 
-<?php if ( $bulk ) : ?>
+<?php
+
+if ( post_type_supports( $screen->post_type, 'title' ) ) :
+	if ( $bulk ) : ?>
 		<div id="bulk-title-div">
 			<div id="bulk-titles"></div>
 		</div>
@@ -1041,16 +910,15 @@ function inline_edit_row( $type ) {
 			<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 		</label>
 
-<?php endif; // $bulk ?>
-
-
-<?php if ( !$bulk ) : ?>
-
 		<label>
 			<span class="title"><?php _e( 'Slug' ); ?></span>
 			<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 		</label>
 
+<?php endif; // $bulk
+endif; // post_type_supports title ?>
+
+<?php if ( !$bulk ) : ?>
 		<label><span class="title"><?php _e( 'Date' ); ?></span></label>
 		<div class="inline-edit-date">
 			<?php touch_time(1, 1, 4, 1); ?>
@@ -1059,12 +927,13 @@ function inline_edit_row( $type ) {
 
 <?php endif; // $bulk
 
-		$authors = get_editable_user_ids( $current_user->id, true, $type ); // TODO: ROLE SYSTEM
+	if ( post_type_supports( $screen->post_type, 'author' ) ) :
+		$authors = get_editable_user_ids( get_current_user_id(), true, $screen->post_type ); // TODO: ROLE SYSTEM
 		$authors_dropdown = '';
 		if ( $authors && count( $authors ) > 1 ) :
 			$users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0);
 			if ( $bulk )
-				$users_opt['show_option_none'] = __('- No Change -');
+				$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
 			$authors_dropdown  = '<label>';
 			$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
 			$authors_dropdown .= wp_dropdown_users( $users_opt );
@@ -1073,7 +942,11 @@ function inline_edit_row( $type ) {
 		endif; // authors
 ?>
 
-<?php if ( !$bulk ) : echo $authors_dropdown; ?>
+<?php if ( !$bulk ) echo $authors_dropdown;
+endif; // post_type_supports author
+
+if ( !$bulk ) :
+?>
 
 		<div class="inline-edit-group">
 			<label class="alignleft">
@@ -1089,7 +962,7 @@ function inline_edit_row( $type ) {
 			</em>
 			<label class="alignleft inline-edit-private">
 				<input type="checkbox" name="keep_private" value="private" />
-				<span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
+				<span class="checkbox-title"><?php echo __('Private'); ?></span>
 			</label>
 		</div>
 
@@ -1097,41 +970,49 @@ function inline_edit_row( $type ) {
 
 	</div></fieldset>
 
-<?php if ( !$is_page && !$bulk ) : ?>
+<?php if ( count($hierarchical_taxonomies) && !$bulk ) : ?>
 
 	<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
-		<span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?>
+
+<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+
+		<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name) ?>
 			<span class="catshow"><?php _e('[more]'); ?></span>
 			<span class="cathide" style="display:none;"><?php _e('[less]'); ?></span>
 		</span>
-		<ul class="cat-checklist">
-			<?php wp_category_checklist(); ?>
+		<input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr($taxonomy->name) . '][]'; ?>" value="0" />
+		<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
+			<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)) ?>
 		</ul>
+
+<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
+
 	</div></fieldset>
 
-<?php endif; // !$is_page && !$bulk ?>
+<?php endif; // count($hierarchical_taxonomies) && !$bulk ?>
 
 	<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 <?php
-	if ( $bulk )
+	if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
 		echo $authors_dropdown;
 ?>
 
-<?php if ( $is_page ) : ?>
+<?php if ( $post_type_object->hierarchical ) : ?>
 
 		<label>
 			<span class="title"><?php _e( 'Parent' ); ?></span>
 <?php
-	$dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
+	$dropdown_args = array('post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
 	if ( $bulk )
-		$dropdown_args['show_option_no_change'] =  __('- No Change -');
+		$dropdown_args['show_option_no_change'] =  __('&mdash; No Change &mdash;');
 	$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
 	wp_dropdown_pages($dropdown_args);
 ?>
 		</label>
 
-<?php	if ( !$bulk ) : ?>
+<?php if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+		if ( !$bulk ) : ?>
 
 		<label>
 			<span class="title"><?php _e( 'Order' ); ?></span>
@@ -1144,67 +1025,80 @@ function inline_edit_row( $type ) {
 			<span class="title"><?php _e( 'Template' ); ?></span>
 			<select name="page_template">
 <?php	if ( $bulk ) : ?>
-				<option value="-1"><?php _e('- No Change -'); ?></option>
+				<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 <?php	endif; // $bulk ?>
 				<option value="default"><?php _e( 'Default Template' ); ?></option>
 				<?php page_template_dropdown() ?>
 			</select>
 		</label>
 
-<?php elseif ( !$bulk ) : // $is_page ?>
+<?php
+	endif; // post_type_supports page-attributes
+endif; // $post_type_object->hierarchical ?>
+
+<?php if ( count($flat_taxonomies) && !$bulk ) : ?>
+
+<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
 
 		<label class="inline-edit-tags">
-			<span class="title"><?php _e( 'Tags' ); ?></span>
-			<textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea>
+			<span class="title"><?php echo esc_html($taxonomy->labels->name) ?></span>
+			<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr($taxonomy->name)?>]" class="tax_input_<?php echo esc_attr($taxonomy->name)?>"></textarea>
 		</label>
 
-<?php endif; // $is_page  ?>
+<?php endforeach; //$flat_taxonomies as $taxonomy ?>
 
-<?php if ( $bulk ) : ?>
+<?php endif; // count($flat_taxonomies) && !$bulk  ?>
+
+<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
+	if ( $bulk ) : ?>
 
 		<div class="inline-edit-group">
+	<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 		<label class="alignleft">
 			<span class="title"><?php _e( 'Comments' ); ?></span>
 			<select name="comment_status">
-				<option value=""><?php _e('- No Change -'); ?></option>
+				<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
 				<option value="open"><?php _e('Allow'); ?></option>
 				<option value="closed"><?php _e('Do not allow'); ?></option>
 			</select>
 		</label>
-
+	<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 		<label class="alignright">
 			<span class="title"><?php _e( 'Pings' ); ?></span>
 			<select name="ping_status">
-				<option value=""><?php _e('- No Change -'); ?></option>
+				<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
 				<option value="open"><?php _e('Allow'); ?></option>
 				<option value="closed"><?php _e('Do not allow'); ?></option>
 			</select>
 		</label>
+	<?php endif; ?>
 		</div>
 
 <?php else : // $bulk ?>
 
 		<div class="inline-edit-group">
+		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 			<label class="alignleft">
 				<input type="checkbox" name="comment_status" value="open" />
 				<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
 			</label>
-
+		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 			<label class="alignleft">
 				<input type="checkbox" name="ping_status" value="open" />
 				<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
 			</label>
+		<?php endif; ?>
 		</div>
 
-<?php endif; // $bulk ?>
-
+<?php endif; // $bulk
+endif; // post_type_supports comments or pings ?>
 
 		<div class="inline-edit-group">
 			<label class="inline-edit-status alignleft">
 				<span class="title"><?php _e( 'Status' ); ?></span>
 				<select name="_status">
 <?php if ( $bulk ) : ?>
-					<option value="-1"><?php _e('- No Change -'); ?></option>
+					<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 <?php endif; // $bulk ?>
 				<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
 					<option value="publish"><?php _e( 'Published' ); ?></option>
@@ -1218,14 +1112,14 @@ function inline_edit_row( $type ) {
 				</select>
 			</label>
 
-<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
+<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
 
 <?php	if ( $bulk ) : ?>
 
 			<label class="alignright">
 				<span class="title"><?php _e( 'Sticky' ); ?></span>
 				<select name="sticky">
-					<option value="-1"><?php _e( '- No Change -' ); ?></option>
+					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 					<option value="sticky"><?php _e( 'Sticky' ); ?></option>
 					<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
 				</select>
@@ -1240,7 +1134,7 @@ function inline_edit_row( $type ) {
 
 <?php	endif; // $bulk ?>
 
-<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ?>
+<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_cap' ) ?>
 
 		</div>
 
@@ -1250,23 +1144,24 @@ function inline_edit_row( $type ) {
 	foreach ( $columns as $column_name => $column_display_name ) {
 		if ( isset( $core_columns[$column_name] ) )
 			continue;
-		do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type);
+		do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $screen->post_type );
 	}
 ?>
 	<p class="submit inline-edit-save">
 		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
 		<?php if ( ! $bulk ) {
 			wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
-			$update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' );
+			$update_text = __( 'Update' );
 			?>
 			<a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
-			<img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
+			<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
 		<?php } else {
-			$update_text = ( $is_page ) ? __( 'Update Pages' ) : __( 'Update Posts' );
+			$update_text = __( 'Update' );
 		?>
 			<input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
 		<?php } ?>
-		<input type="hidden" name="post_view" value="<?php echo $m; ?>" />
+		<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+		<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
 		<br class="clear" />
 	</p>
 	</td></tr>
@@ -1286,20 +1181,20 @@ function inline_edit_row( $type ) {
  * @param unknown_type $post
  */
 function get_inline_data($post) {
-
-	if ( ! current_user_can('edit_' . $post->post_type, $post->ID) )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! current_user_can($post_type_object->cap->edit_post, $post->ID) )
 		return;
 
-	$title = esc_attr($post->post_title);
+	$title = htmlspecialchars( trim( $post->post_title ), ENT_QUOTES );
 
 	echo '
 <div class="hidden" id="inline_' . $post->ID . '">
 	<div class="post_title">' . $title . '</div>
 	<div class="post_name">' . apply_filters('editable_slug', $post->post_name) . '</div>
 	<div class="post_author">' . $post->post_author . '</div>
-	<div class="comment_status">' . $post->comment_status . '</div>
-	<div class="ping_status">' . $post->ping_status . '</div>
-	<div class="_status">' . $post->post_status . '</div>
+	<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
+	<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
+	<div class="_status">' . esc_html( $post->post_status ) . '</div>
 	<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
 	<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
 	<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
@@ -1308,17 +1203,27 @@ function get_inline_data($post) {
 	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
 	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
 
-	if( $post->post_type == 'page' )
-		echo '
-	<div class="post_parent">' . $post->post_parent . '</div>
-	<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>
-	<div class="menu_order">' . $post->menu_order . '</div>';
+	if ( $post_type_object->hierarchical )
+		echo '<div class="post_parent">' . $post->post_parent . '</div>';
+
+	if ( $post->post_type == 'page' )
+		echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
 
-	if( $post->post_type == 'post' )
-		echo '
-	<div class="tags_input">' . esc_html( str_replace( ',', ', ', get_tags_to_edit($post->ID) ) ) . '</div>
-	<div class="post_category">' . implode( ',', wp_get_post_categories( $post->ID ) ) . '</div>
-	<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( $post_type_object->hierarchical )
+		echo '<div class="menu_order">' . $post->menu_order . '</div>';
+
+	$taxonomy_names = get_object_taxonomies( $post->post_type );
+	foreach ( $taxonomy_names as $taxonomy_name) {
+		$taxonomy = get_taxonomy( $taxonomy_name );
+
+		if ( $taxonomy->hierarchical && $taxonomy->show_ui )
+				echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">' . implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array('fields'=>'ids')) ) . '</div>';
+		elseif ( $taxonomy->show_ui )
+			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">' . esc_html( str_replace( ',', ', ', get_terms_to_edit($post->ID, $taxonomy_name) ) ) . '</div>';
+	}
+
+	if ( !$post_type_object->hierarchical )
+		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
 
 	echo '</div>';
 }
@@ -1345,8 +1250,6 @@ function post_rows( $posts = array() ) {
 		$post_ids[] = $a_post->ID;
 
 	$comment_pending_count = get_pending_comments_num($post_ids);
-	if ( empty($comment_pending_count) )
-		$comment_pending_count = array();
 
 	foreach ( $posts as $post ) {
 		if ( empty($comment_pending_count[$post->ID]) )
@@ -1366,7 +1269,7 @@ function post_rows( $posts = array() ) {
  * @param unknown_type $mode
  */
 function _post_row($a_post, $pending_comments, $mode) {
-	global $post, $current_user;
+	global $post, $current_screen;
 	static $rowclass;
 
 	$global_post = $post;
@@ -1374,14 +1277,15 @@ function _post_row($a_post, $pending_comments, $mode) {
 	setup_postdata($post);
 
 	$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-	$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+	$post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
 	$edit_link = get_edit_post_link( $post->ID );
 	$title = _draft_or_post_title();
+	$post_type_object = get_post_type_object($post->post_type);
 ?>
 	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top">
 <?php
-	$posts_columns = get_column_headers('edit');
-	$hidden = get_hidden_columns('edit');
+	$posts_columns = get_column_headers( $current_screen );
+	$hidden = get_hidden_columns( $current_screen );
 	foreach ( $posts_columns as $column_name=>$column_display_name ) {
 		$class = "class=\"$column_name column-$column_name\"";
 
@@ -1395,7 +1299,7 @@ function _post_row($a_post, $pending_comments, $mode) {
 
 		case 'cb':
 		?>
-		<th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+		<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
 		<?php
 		break;
 
@@ -1438,27 +1342,27 @@ function _post_row($a_post, $pending_comments, $mode) {
 		case 'title':
 			$attributes = 'class="post-title column-title"' . $style;
 		?>
-		<td <?php echo $attributes ?>><strong><?php if ( current_user_can('edit_post', $post->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; }; _post_states($post); ?></strong>
+		<td <?php echo $attributes ?>><strong><?php if ( current_user_can($post_type_object->cap->edit_post, $post->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; }; _post_states($post); ?></strong>
 		<?php
 			if ( 'excerpt' == $mode )
 				the_excerpt();
 
 			$actions = array();
-			if ( current_user_can('edit_post', $post->ID) && 'trash' != $post->post_status ) {
-				$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . esc_attr(__('Edit this post')) . '">' . __('Edit') . '</a>';
-				$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr(__('Edit this post inline')) . '">' . __('Quick&nbsp;Edit') . '</a>';
+			if ( current_user_can($post_type_object->cap->edit_post, $post->ID) && 'trash' != $post->post_status ) {
+				$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . esc_attr(__('Edit this item')) . '">' . __('Edit') . '</a>';
+				$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr(__('Edit this item inline')) . '">' . __('Quick&nbsp;Edit') . '</a>';
 			}
-			if ( current_user_can('delete_post', $post->ID) ) {
+			if ( current_user_can($post_type_object->cap->delete_post, $post->ID) ) {
 				if ( 'trash' == $post->post_status )
-					$actions['untrash'] = "<a title='" . esc_attr(__('Restore this post from the Trash')) . "' href='" . wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID) . "'>" . __('Restore') . "</a>";
+					$actions['untrash'] = "<a title='" . esc_attr(__('Restore this item from the Trash')) . "' href='" . wp_nonce_url( admin_url( sprintf($post_type_object->_edit_link . '&amp;action=untrash', $post->ID) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>" . __('Restore') . "</a>";
 				elseif ( EMPTY_TRASH_DAYS )
-					$actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this post to the Trash')) . "' href='" . get_delete_post_link($post->ID) . "'>" . __('Trash') . "</a>";
+					$actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this item to the Trash')) . "' href='" . get_delete_post_link($post->ID) . "'>" . __('Trash') . "</a>";
 				if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-					$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this post permanently')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+					$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this item permanently')) . "' href='" . get_delete_post_link($post->ID, '', true) . "'>" . __('Delete Permanently') . "</a>";
 			}
 			if ( in_array($post->post_status, array('pending', 'draft')) ) {
-				if ( current_user_can('edit_post', $post->ID) )
-					$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
+				if ( current_user_can($post_type_object->cap->edit_post, $post->ID) )
+					$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink($post->ID) ) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
 			} elseif ( 'trash' != $post->post_status ) {
 				$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
 			}
@@ -1486,7 +1390,7 @@ function _post_row($a_post, $pending_comments, $mode) {
 			if ( !empty( $categories ) ) {
 				$out = array();
 				foreach ( $categories as $c )
-					$out[] = "<a href='edit.php?category_name=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
+					$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;category_name={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
 					echo join( ', ', $out );
 			} else {
 				_e('Uncategorized');
@@ -1502,7 +1406,7 @@ function _post_row($a_post, $pending_comments, $mode) {
 			if ( !empty( $tags ) ) {
 				$out = array();
 				foreach ( $tags as $c )
-					$out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
+					$out[] = "<a href='edit.php?post_type={$post->post_type}&amp;tag={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
 				echo join( ', ', $out );
 			} else {
 				_e('No Tags');
@@ -1528,7 +1432,7 @@ function _post_row($a_post, $pending_comments, $mode) {
 
 		case 'author':
 		?>
-		<td <?php echo $attributes ?>><a href="edit.php?author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
+		<td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post->post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
 		<?php
 		break;
 
@@ -1540,13 +1444,13 @@ function _post_row($a_post, $pending_comments, $mode) {
 
 		case 'control_edit':
 		?>
-		<td><?php if ( current_user_can('edit_post', $post->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+		<td><?php if ( current_user_can($post_type_object->cap->edit_post, $post->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit') . "</a>"; } ?></td>
 		<?php
 		break;
 
 		case 'control_delete':
 		?>
-		<td><?php if ( current_user_can('delete_post', $post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td>
+		<td><?php if ( current_user_can($post_type_object->cap->delete_post, $post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td>
 		<?php
 		break;
 
@@ -1576,7 +1480,7 @@ function _post_row($a_post, $pending_comments, $mode) {
  * @param unknown_type $level
  */
 function display_page_row( $page, $level = 0 ) {
-	global $post;
+	global $post, $current_screen;
 	static $rowclass;
 
 	$post = $page;
@@ -1603,14 +1507,16 @@ function display_page_row( $page, $level = 0 ) {
 	$pad = str_repeat( '&#8212; ', $level );
 	$id = (int) $page->ID;
 	$rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-	$posts_columns = get_column_headers('edit-pages');
-	$hidden = get_hidden_columns('edit-pages');
+	$posts_columns = get_column_headers( $current_screen );
+	$hidden = get_hidden_columns(  $current_screen );
 	$title = _draft_or_post_title();
+	$post_type = $page->post_type;
+	$post_type_object = get_post_type_object($post_type);
 ?>
 <tr id="page-<?php echo $id; ?>" class="<?php echo $rowclass; ?> iedit">
 <?php
 
-foreach ($posts_columns as $column_name=>$column_display_name) {
+foreach ( $posts_columns as $column_name => $column_display_name ) {
 	$class = "class=\"$column_name column-$column_name\"";
 
 	$style = '';
@@ -1623,7 +1529,7 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 
 	case 'cb':
 		?>
-		<th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th>
+		<th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
 		<?php
 		break;
 	case 'date':
@@ -1661,24 +1567,24 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 		$attributes = 'class="post-title page-title column-title"' . $style;
 		$edit_link = get_edit_post_link( $page->ID );
 		?>
-		<td <?php echo $attributes ?>><strong><?php if ( current_user_can('edit_page', $page->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); echo isset($parent_name) ? ' | ' . __('Parent Page: ') . esc_html($parent_name) : ''; ?></strong>
+		<td <?php echo $attributes ?>><strong><?php if ( current_user_can($post_type_object->cap->edit_post, $page->ID) && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); echo isset($parent_name) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html($parent_name) : ''; ?></strong>
 		<?php
 		$actions = array();
-		if ( current_user_can('edit_page', $page->ID) && $post->post_status != 'trash' ) {
+		if ( current_user_can($post_type_object->cap->edit_post, $page->ID) && $post->post_status != 'trash' ) {
 			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr(__('Edit this page')) . '">' . __('Edit') . '</a>';
 			$actions['inline'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
 		}
-		if ( current_user_can('delete_page', $page->ID) ) {
+		if ( current_user_can($post_type_object->cap->delete_post, $page->ID) ) {
 			if ( $post->post_status == 'trash' )
-				$actions['untrash'] = "<a title='" . esc_attr(__('Remove this page from the Trash')) . "' href='" . wp_nonce_url("page.php?action=untrash&amp;post=$page->ID", 'untrash-page_' . $page->ID) . "'>" . __('Restore') . "</a>";
+				$actions['untrash'] = "<a title='" . esc_attr(__('Remove this page from the Trash')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=untrash&amp;post=$page->ID", 'untrash-' . $post->post_type . '_' . $page->ID) . "'>" . __('Restore') . "</a>";
 			elseif ( EMPTY_TRASH_DAYS )
 				$actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this page to the Trash')) . "' href='" . get_delete_post_link($page->ID) . "'>" . __('Trash') . "</a>";
 			if ( $post->post_status == 'trash' || !EMPTY_TRASH_DAYS )
-				$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page permanently')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "'>" . __('Delete Permanently') . "</a>";
+				$actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page permanently')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=delete&amp;post=$page->ID", 'delete-' . $post->post_type . '_' . $page->ID) . "'>" . __('Delete Permanently') . "</a>";
 		}
 		if ( in_array($post->post_status, array('pending', 'draft')) ) {
-			if ( current_user_can('edit_page', $page->ID) )
-				$actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
+			if ( current_user_can($post_type_object->cap->edit_post, $page->ID) )
+				$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink($page->ID) ) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
 		} elseif ( $post->post_status != 'trash' ) {
 			$actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
 		}
@@ -1716,7 +1622,7 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 
 	case 'author':
 		?>
-		<td <?php echo $attributes ?>><a href="edit-pages.php?author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
+		<td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
 		<?php
 		break;
 
@@ -1776,7 +1682,7 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) {
 			// catch and repair bad pages
 			if ( $page->post_parent == $page->ID ) {
 				$page->post_parent = 0;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = '0' WHERE ID = %d", $page->ID) );
+				$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
 				clean_page_cache( $page->ID );
 			}
 
@@ -1820,12 +1726,9 @@ function page_rows($pages, $pagenum = 1, $per_page = 20) {
 	}
 }
 
-/*
+/**
  * Given a top level page ID, display the nested hierarchy of sub-pages
  * together with paging support
- */
-/**
- * {@internal Missing Short Description}}
  *
  * @since unknown
  *
@@ -1879,20 +1782,19 @@ function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Generate HTML for a single row on the users.php admin panel.
  *
- * @since unknown
+ * @since 2.1.0
  *
- * @param unknown_type $user_object
- * @param unknown_type $style
- * @param unknown_type $role
- * @return unknown
+ * @param object $user_object
+ * @param string $style Optional. Attributes added to the TR element.  Must be sanitized.
+ * @param string $role Key for the $wp_roles array.
+ * @param int $numposts Optional. Post count to display for this user.  Defaults to zero, as in, a new user has made zero posts.
+ * @return string
  */
-function user_row( $user_object, $style = '', $role = '' ) {
+function user_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
 	global $wp_roles;
 
-	$current_user = wp_get_current_user();
-
 	if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
 		$user_object = new WP_User( (int) $user_object );
 	$user_object = sanitize_user_object($user_object, 'display');
@@ -1904,13 +1806,12 @@ function user_row( $user_object, $style = '', $role = '' ) {
 		$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 );
 	$checkbox = '';
 	// Check if the user for this row is editable
-	if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+	if ( current_user_can( 'list_users' ) ) {
 		// Set up the user editing link
-		// TODO: make profile/user-edit determination a seperate function
-		if ($current_user->ID == $user_object->ID) {
+		// TODO: make profile/user-edit determination a separate function
+		if ( get_current_user_id() == $user_object->ID) {
 			$edit_link = 'profile.php';
 		} else {
 			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
@@ -1919,9 +1820,18 @@ function user_row( $user_object, $style = '', $role = '' ) {
 
 		// Set up the hover actions for this user
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		if ( $current_user->ID != $user_object->ID )
+
+		if ( current_user_can('edit_user',  $user_object->ID) ) {
+			$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
+			$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+		} else {
+			$edit = "<strong>$user_object->user_login</strong><br />";
+		}
+
+		if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
 			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>";
+		if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
+			$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . "</a>";
 		$actions = apply_filters('user_row_actions', $actions, $user_object);
 		$action_count = count($actions);
 		$i = 0;
@@ -1964,7 +1874,7 @@ function user_row( $user_object, $style = '', $role = '' ) {
 				$r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
 				break;
 			case 'email':
-				$r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>";
+				$r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('E-mail: %s' ), $email ) . "'>$email</a></td>";
 				break;
 			case 'role':
 				$r .= "<td $attributes>$role_name</td>";
@@ -2095,8 +2005,10 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 	$comment = get_comment( $comment_id );
 	$post = get_post($comment->comment_post_ID);
 	$the_comment_status = wp_get_comment_status($comment->comment_ID);
-	$user_can = current_user_can('edit_post', $post->ID);
+	$post_type_object = get_post_type_object($post->post_type);
+	$user_can = current_user_can($post_type_object->cap->edit_post, $post->ID);
 
+	$comment_url = esc_url(get_comment_link($comment->comment_ID));
 	$author_url = get_comment_author_url();
 	if ( 'http://' == $author_url )
 		$author_url = '';
@@ -2145,7 +2057,18 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 			case 'comment':
 				echo "<td $attributes>";
 				echo '<div id="submitted-on">';
-				printf(__('Submitted on <a href="%1$s">%2$s at %3$s</a>'), get_comment_link($comment->comment_ID), get_comment_date(__('Y/m/d')), get_comment_date(__('g:ia')));
+				/* translators: 2: comment date, 3: comment time */
+				printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
+					/* translators: comment date format. See http://php.net/date */ get_comment_date( __('Y/m/d') ),
+					/* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
+
+				if ( $comment->comment_parent ) {
+					$parent = get_comment( $comment->comment_parent );
+					$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+					$name = apply_filters( 'get_comment_author', $parent->comment_author ); // there's no API function for this
+					printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
+				}
+
 				echo '</div>';
 				comment_text();
 				if ( $user_can ) { ?>
@@ -2172,18 +2095,18 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 
 					if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
 						if ( 'approved' == $the_comment_status )
-							$actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+							$actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
 						else if ( 'unapproved' == $the_comment_status )
-							$actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+							$actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
 					} else {
-						$actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-						$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+						$actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+						$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
 					}
 
 					if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
-						$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+						$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
 					} elseif ( 'spam' == $the_comment_status ) {
-						$actions['unspam'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . __( 'Not Spam' ) . '</a>';
+						$actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
 					} elseif ( 'trash' == $the_comment_status ) {
 						$actions['untrash'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1 vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
 					}
@@ -2191,14 +2114,14 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 					if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
 						$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::delete=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
 					} else {
-						$actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . __( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
+						$actions['trash'] = "<a href='$trash_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
 					}
 
 					if ( 'trash' != $the_comment_status ) {
-						$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
-						$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
+						$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
+						$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.esc_attr__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
 						if ( 'spam' != $the_comment_status )
-							$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
+							$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
 					}
 
 					$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
@@ -2252,9 +2175,9 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 			case 'response':
 				if ( 'single' !== $mode ) {
 					if ( isset( $_comment_pending_count[$post->ID] ) ) {
-						$pending_comments = absint( $_comment_pending_count[$post->ID] );
+						$pending_comments = $_comment_pending_count[$post->ID];
 					} else {
-						$_comment_pending_count_temp = (array) get_pending_comments_num( array( $post->ID ) );
+						$_comment_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
 						$pending_comments = $_comment_pending_count[$post->ID] = $_comment_pending_count_temp[$post->ID];
 					}
 					if ( $user_can ) {
@@ -2266,7 +2189,7 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 					echo "<td $attributes>\n";
 					echo '<div class="response-links"><span class="post-com-count-wrapper">';
 					echo $post_link . '<br />';
-					$pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
+					$pending_phrase = esc_attr(sprintf( __('%s pending'), number_format( $pending_comments ) ));
 					if ( $pending_comments )
 						echo '<strong>';
 					comments_number("<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
@@ -2300,8 +2223,6 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
  * @param unknown_type $mode
  */
 function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
-	global $current_user;
-
 	// allow plugin to replace the popup content
 	$content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) );
 
@@ -2348,12 +2269,12 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 	<a href="#comments-form" class="save button-primary alignright" tabindex="104">
 	<span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
 	<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
-	<img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
+	<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
 	<span class="error" style="display:none;"></span>
 	<br class="clear" />
 	</p>
 
-	<input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />
+	<input type="hidden" name="user_ID" id="user_ID" value="<?php echo get_current_user_id(); ?>" />
 	<input type="hidden" name="action" id="action" value="" />
 	<input type="hidden" name="comment_ID" id="comment_ID" value="" />
 	<input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" />
@@ -2361,7 +2282,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 	<input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
 	<input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
-	<?php wp_nonce_field( 'replyto-comment', '_ajax_nonce', false ); ?>
+	<?php wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false ); ?>
 	<?php wp_comment_form_unfiltered_html_nonce(); ?>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
@@ -2388,39 +2309,6 @@ function wp_comment_trashnotice() {
 <?php
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $currentcat
- * @param unknown_type $currentparent
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $categories
- * @return unknown
- */
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
-
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '&#8211; ', $level );
-				$category->name = esc_html( $category->name );
-				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
-				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
-			}
-		}
-	} else {
-		return false;
-	}
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -2509,7 +2397,7 @@ function _list_meta_row( $entry, &$count ) {
 
 	$r .= "\n\t\t<div class='submit'><input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
 	$r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='". esc_attr__( 'Delete' ) ."' />";
-	$r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". esc_attr__( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /></div>";
+	$r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". esc_attr__( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta' /></div>";
 	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
 	$r .= "</td>";
 
@@ -2530,12 +2418,12 @@ function meta_form() {
 		FROM $wpdb->postmeta
 		GROUP BY meta_key
 		HAVING meta_key NOT LIKE '\_%'
-		ORDER BY LOWER(meta_key)
+		ORDER BY meta_key
 		LIMIT $limit" );
 	if ( $keys )
 		natcasesort($keys);
 ?>
-<p><strong><?php _e( 'Add new custom field:' ) ?></strong></p>
+<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
@@ -2549,12 +2437,11 @@ function meta_form() {
 <td id="newmetaleft" class="left">
 <?php if ( $keys ) { ?>
 <select id="metakeyselect" name="metakeyselect" tabindex="7">
-<option value="#NONE#"><?php _e( '- Select -' ); ?></option>
+<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
 <?php
 
 	foreach ( $keys as $key ) {
-		$key = esc_attr( $key );
-		echo "\n<option value='" . esc_attr($key) . "'>$key</option>";
+		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
 	}
 ?>
 </select>
@@ -2571,7 +2458,7 @@ function meta_form() {
 
 <tr><td colspan="2" class="submit">
 <input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php esc_attr_e( 'Add Custom Field' ) ?>" />
-<?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?>
+<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
 </tbody>
 </table>
@@ -2593,7 +2480,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 	global $wp_locale, $post, $comment;
 
 	if ( $for_post )
-		$edit = ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) ) ? false : true;
+		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
 
 	$tab_index_attribute = '';
 	if ( (int) $tab_index > 0 )
@@ -2601,7 +2488,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 
-	$time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
+	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
 	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
 	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
@@ -2708,18 +2595,6 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
 	}
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function browse_happy() {
-	$getit = __( 'WordPress recommends a better browser' );
-	echo '
-		<div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></div>
-';
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -2735,7 +2610,7 @@ function the_attachment_links( $id = false ) {
 	if ( $post->post_type != 'attachment' )
 		return false;
 
-	$icon = get_attachment_icon( $post->ID );
+	$icon = wp_get_attachment_image( $post->ID, 'thumbnail', true );
 	$attachment_data = wp_get_attachment_metadata( $id );
 	$thumb = isset( $attachment_data['thumb'] );
 ?>
@@ -2783,13 +2658,12 @@ function the_attachment_links( $id = false ) {
  * @param string $default slug for the role that should be already selected
  */
 function wp_dropdown_roles( $selected = false ) {
-	global $wp_roles;
 	$p = '';
 	$r = '';
 
 	$editable_roles = get_editable_roles();
 
-	foreach( $editable_roles as $role => $details ) {
+	foreach ( $editable_roles as $role => $details ) {
 		$name = translate_user_role($details['name'] );
 		if ( $selected == $role ) // Make default first in list
 			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
@@ -2880,18 +2754,6 @@ function wp_import_upload_form( $action ) {
 	endif;
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function wp_remember_old_slug() {
-	global $post;
-	$name = esc_attr($post->post_name); // just in case
-	if ( strlen($name) )
-		echo '<input type="hidden" id="wp-old-slug" name="wp-old-slug" value="' . $name . '" />';
-}
-
 /**
  * Add a meta box to an edit form.
  *
@@ -2956,29 +2818,27 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Meta-Box template function
  *
- * @since unknown
+ * @since 2.5.0
  *
- * @param unknown_type $page
- * @param unknown_type $context
- * @param unknown_type $object
+ * @param string $page page identifier, also known as screen identifier
+ * @param string $context box context
+ * @param mixed $object gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
 function do_meta_boxes($page, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	//do_action('do_meta_boxes', $page, $context, $object);
-
 	$hidden = get_hidden_meta_boxes($page);
 
-	echo "<div id='$context-sortables' class='meta-box-sortables'>\n";
+	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
 	$i = 0;
 	do {
 		// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-		if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page", 0, false ) ) {
+		if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
 			foreach ( $sorted as $box_context => $ids )
 				foreach ( explode(',', $ids) as $id )
 					if ( $id )
@@ -2996,9 +2856,8 @@ function do_meta_boxes($page, $context, $object) {
 						continue;
 					$i++;
 					$style = '';
-					if ( in_array($box['id'], $hidden) )
-						$style = 'style="display:none;"';
-					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '" ' . $style . '>' . "\n";
+					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
+					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
 					echo '<div class="handlediv" title="' . __('Click to toggle') . '"><br /></div>';
 					echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
 					echo '<div class="inside">' . "\n";
@@ -3044,19 +2903,22 @@ function remove_meta_box($id, $page, $context) {
  *
  * @since unknown
  *
- * @param unknown_type $page
+ * @param unknown_type $screen
  */
-function meta_box_prefs($page) {
+function meta_box_prefs($screen) {
 	global $wp_meta_boxes;
 
-	if ( empty($wp_meta_boxes[$page]) )
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	if ( empty($wp_meta_boxes[$screen->id]) )
 		return;
 
-	$hidden = get_hidden_meta_boxes($page);
+	$hidden = get_hidden_meta_boxes($screen);
 
-	foreach ( array_keys($wp_meta_boxes[$page]) as $context ) {
-		foreach ( array_keys($wp_meta_boxes[$page][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
+	foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) {
+		foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) {
+			foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) {
 				if ( false == $box || ! $box['title'] )
 					continue;
 				// Submit box cannot be hidden
@@ -3071,13 +2933,23 @@ function meta_box_prefs($page) {
 	}
 }
 
-function get_hidden_meta_boxes($page) {
-	$hidden = (array) get_user_option( "meta-box-hidden_$page", 0, false );
+/**
+ * Get Hidden Meta Boxes
+ *
+ * @since 2.7
+ *
+ * @param string|object $screen Screen identifier
+ * @return array Hidden Meta Boxes
+ */
+function get_hidden_meta_boxes( $screen ) {
+	if ( is_string( $screen ) )
+		$screen = convert_to_screen( $screen );
+
+	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
 
 	// Hide slug boxes by default
-	if ( empty($hidden[0]) ) {
+	if ( !is_array( $hidden ) )
 		$hidden = array('slugdiv');
-	}
 
 	return $hidden;
 }
@@ -3085,16 +2957,31 @@ function get_hidden_meta_boxes($page) {
 /**
  * Add a new section to a settings page.
  *
+ * Part of the Settings API. Use this to define new settings sections for an admin page.
+ * Show settings sections in your admin page callback function with do_settings_sections().
+ * Add settings fields to your section with add_settings_field()
+ *
+ * The $callback argument should be the name of a function that echoes out any
+ * content you want to show at the top of the settings section before the actual
+ * fields. It can output nothing if you want.
+ *
  * @since 2.7.0
  *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $title Title of the section.
- * @param string $callback Function that fills the section with the desired content. The function should echo its output.
- * @param string $page The type of settings page on which to show the section (general, reading, writing, ...).
+ * @global $wp_settings_sections Storage array of all settings sections added to admin pages
+ *
+ * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
+ * @param string $title Formatted title of the section. Shown as the heading for the section.
+ * @param string $callback Function that echos out any content at the top of the section (between heading and fields).
+ * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
  */
 function add_settings_section($id, $title, $callback, $page) {
 	global $wp_settings_sections;
 
+	if ( 'misc' == $page ) {
+		_deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
+		$page = 'general';
+	}
+
 	if ( !isset($wp_settings_sections) )
 		$wp_settings_sections = array();
 	if ( !isset($wp_settings_sections[$page]) )
@@ -3106,20 +2993,35 @@ function add_settings_section($id, $title, $callback, $page) {
 }
 
 /**
- * Add a new field to a settings page.
+ * Add a new field to a section of a settings page
+ *
+ * Part of the Settings API. Use this to define a settings field that will show
+ * as part of a settings section inside a settings page. The fields are shown using
+ * do_settings_fields() in do_settings-sections()
+ *
+ * The $callback argument should be the name of a function that echoes out the
+ * html input tags for this setting field. Use get_option() to retrive existing
+ * values to show.
  *
  * @since 2.7.0
  *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $title Title of the field.
- * @param string $callback Function that fills the field with the desired content. The function should echo its output.
- * @param string $page The type of settings page on which to show the field (general, reading, writing, ...).
- * @param string $section The section of the settingss page in which to show the box (default, ...).
+ * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
+ *
+ * @param string $id Slug-name to identify the field. Used in the 'id' attribute of tags.
+ * @param string $title Formatted title of the field. Shown as the label for the field during output.
+ * @param string $callback Function that fills the field with the desired form inputs. The function should echo its output.
+ * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
+ * @param string $section The slug-name of the section of the settingss page in which to show the box (default, ...).
  * @param array $args Additional arguments
  */
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
 	global $wp_settings_fields;
 
+	if ( 'misc' == $page ) {
+		_deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
+		$page = 'general';
+	}
+
 	if ( !isset($wp_settings_fields) )
 		$wp_settings_fields = array();
 	if ( !isset($wp_settings_fields[$page]) )
@@ -3131,11 +3033,17 @@ function add_settings_field($id, $title, $callback, $page, $section = 'default',
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Prints out all settings sections added to a particular settings page
  *
+ * Part of the Settings API. Use this in a settings page callback function
+ * to output all the sections and fields that were added to that $page with
+ * add_settings_section() and add_settings_field()
+ *
+ * @global $wp_settings_sections Storage array of all settings sections added to admin pages
+ * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
  * @since unknown
  *
- * @param unknown_type $page
+ * @param string $page The slug name of the page whos settings sections you want to output
  */
 function do_settings_sections($page) {
 	global $wp_settings_sections, $wp_settings_fields;
@@ -3155,12 +3063,18 @@ function do_settings_sections($page) {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Print out the settings fields for a particular settings section
+ *
+ * Part of the Settings API. Use this in a settings page to output
+ * a specific section. Should normally be called by do_settings_sections()
+ * rather than directly.
+ *
+ * @global $wp_settings_fields Storage array of settings fields and their pages/sections
  *
  * @since unknown
  *
- * @param unknown_type $page
- * @param unknown_type $section
+ * @param string $page Slug title of the admin page who's settings fields you want to show.
+ * @param section $section Slug title of the settings section who's fields you want to show.
  */
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
@@ -3181,6 +3095,131 @@ function do_settings_fields($page, $section) {
 	}
 }
 
+/**
+ * Register a settings error to be displayed to the user
+ *
+ * Part of the Settings API. Use this to show messages to users about settings validation
+ * problems, missing settings or anything else.
+ *
+ * Settings errors should be added inside the $sanitize_callback function defined in
+ * register_setting() for a given setting to give feedback about the submission.
+ *
+ * By default messages will show immediately after the submission that generated the error.
+ * Additional calls to settings_errors() can be used to show errors even when the settings
+ * page is first accessed.
+ *
+ * @global array $wp_settings_errors Storage array of errors registered during this pageload
+ *
+ * @param string $setting Slug title of the setting to which this error applies
+ * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
+ * @param string $message The formatted message text to display to the user (will be shown inside styled <div> and <p>)
+ * @param string $type The type of message it is, controls HTML class. Use 'error' or 'updated'.
+ */
+function add_settings_error( $setting, $code, $message, $type = 'error' ) {
+	global $wp_settings_errors;
+
+	if ( !isset($wp_settings_errors) )
+		$wp_settings_errors = array();
+
+	$new_error = array(
+		'setting' => $setting,
+		'code' => $code,
+		'message' => $message,
+		'type' => $type
+	);
+	$wp_settings_errors[] = $new_error;
+}
+
+/**
+ * Fetch settings errors registered by add_settings_error()
+ *
+ * Checks the $wp_settings_errors array for any errors declared during the current
+ * pageload and returns them.
+ *
+ * If changes were just submitted ($_GET['updated']) and settings errors were saved
+ * to the 'settings_errors' transient then those errors will be returned instead. This
+ * is used to pass errors back across pageloads.
+ *
+ * Use the $sanitize argument to manually re-sanitize the option before returning errors.
+ * This is useful if you have errors or notices you want to show even when the user
+ * hasn't submitted data (i.e. when they first load an options page, or in admin_notices action hook)
+ *
+ * @global array $wp_settings_errors Storage array of errors registered during this pageload
+ *
+ * @param string $setting Optional slug title of a specific setting who's errors you want.
+ * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
+ * @return array Array of settings errors
+ */
+function get_settings_errors( $setting = '', $sanitize = FALSE ) {
+	global $wp_settings_errors;
+
+	// If $sanitize is true, manually re-run the sanitizisation for this option
+	// This allows the $sanitize_callback from register_setting() to run, adding
+	// any settings errors you want to show by default.
+	if ( $sanitize )
+		sanitize_option( $setting, get_option($setting));
+
+	// If settings were passed back from options.php then use them
+	// Ignore transients if $sanitize is true, we dont' want the old values anyway
+	if ( isset($_GET['updated']) && $_GET['updated'] && get_transient('settings_errors') ) {
+		$settings_errors = get_transient('settings_errors');
+		delete_transient('settings_errors');
+	// Otherwise check global in case validation has been run on this pageload
+	} elseif ( count( $wp_settings_errors ) ) {
+		$settings_errors = $wp_settings_errors;
+	} else {
+		return;
+	}
+
+	// Filter the results to those of a specific setting if one was set
+	if ( $setting ) {
+		foreach ( (array) $settings_errors as $key => $details )
+			if ( $setting != $details['setting'] )
+				unset( $settings_errors[$key] );
+	}
+	return $settings_errors;
+}
+
+/**
+ * Display settings errors registered by add_settings_error()
+ *
+ * Part of the Settings API. Outputs a <div> for each error retrieved by get_settings_errors().
+ *
+ * This is called automatically after a settings page based on the Settings API is submitted.
+ * Errors should be added during the validation callback function for a setting defined in register_setting()
+ *
+ * The $sanitize option is passed into get_settings_errors() and will re-run the setting sanitization
+ * on its current value.
+ *
+ * The $hide_on_update option will cause errors to only show when the settings page is first loaded.
+ * if the user has already saved new values it will be hidden to avoid repeating messages already
+ * shown in the default error reporting after submission. This is useful to show general errors like missing
+ * settings when the user arrives at the settings page.
+ *
+ * @param string $setting Optional slug title of a specific setting who's errors you want.
+ * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
+ * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
+ * @return <type>
+ */
+function settings_errors ( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
+
+	if ($hide_on_update AND $_GET['updated']) return;
+
+	$settings_errors = get_settings_errors( $setting, $sanitize );
+
+	if ( !is_array($settings_errors) ) return;
+
+	$output = '';
+	foreach ( $settings_errors as $key => $details ) {
+		$css_id = 'setting-error-' . $details['code'];
+		$css_class = $details['type'] . ' settings-error';
+		$output .= "<div id='$css_id' class='$css_class'> \n";
+		$output .= "<p><strong>{$details['message']}</strong></p>";
+		$output .= "</div> \n";
+	}
+	echo $output;
+}
+
 /**
  * {@internal Missing Short Description}}
  *
@@ -3188,20 +3227,20 @@ function do_settings_fields($page, $section) {
  *
  * @param unknown_type $page
  */
-function manage_columns_prefs($page) {
-	$columns = get_column_headers($page);
-
-	$hidden = get_hidden_columns($page);
+function manage_columns_prefs( $page ) {
+	$columns = get_column_headers( $page );
+	$hidden  = get_hidden_columns( $page );
+	$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
 
 	foreach ( $columns as $column => $title ) {
-		// Can't hide these
-		if ( 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column )
+		// Can't hide these or they are special
+		if ( in_array( $column, $special ) )
 			continue;
-		if ( empty($title) )
+		if ( empty( $title ) )
 			continue;
 
 		if ( 'comments' == $column )
-			$title = __('Comments');
+			$title = __( 'Comments' );
 		$id = "$column-hide";
 		echo '<label for="' . $id . '">';
 		echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . (! in_array($column, $hidden) ? ' checked="checked"' : '') . ' />';
@@ -3232,10 +3271,16 @@ function find_posts_div($found_action = '') {
 				<input type="text" id="find-posts-input" name="ps" value="" />
 				<input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
-				<input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
-				<label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
-				<input type="radio" name="find-posts-what" id="find-posts-pages" value="pages" />
-				<label for="find-posts-pages"><?php _e( 'Pages' ); ?></label>
+				<?php
+				$post_types = get_post_types( array('public' => true), 'objects' );
+				foreach ( $post_types as $post ) {
+					if ( 'attachment' == $post->name )
+						continue;
+				?>
+				<input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name,  'post'); ?> />
+				<label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
+				<?php
+				} ?>
 			</div>
 			<div id="find-posts-response"></div>
 		</div>
@@ -3267,55 +3312,62 @@ function the_post_password() {
  * @since unknown
  */
 function favorite_actions( $screen = null ) {
-	switch ( $screen ) {
-		case 'post-new.php':
-			$default_action = array('edit.php' => array(__('Edit Posts'), 'edit_posts'));
-			break;
-		case 'edit-pages.php':
-			$default_action = array('page-new.php' => array(__('New Page'), 'edit_pages'));
-			break;
-		case 'page-new.php':
-			$default_action = array('edit-pages.php' => array(__('Edit Pages'), 'edit_pages'));
-			break;
-		case 'upload.php':
-			$default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));
-			break;
-		case 'media-new.php':
-			$default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
-			break;
-		case 'link-manager.php':
-			$default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
-			break;
-		case 'link-add.php':
-			$default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
-			break;
-		case 'users.php':
-			$default_action = array('user-new.php' => array(__('New User'), 'create_users'));
-			break;
-		case 'user-new.php':
-			$default_action = array('users.php' => array(__('Edit Users'), 'edit_users'));
-			break;
-		case 'plugins.php':
-			$default_action = array('plugin-install.php' => array(__('Install Plugins'), 'install_plugins'));
-			break;
-		case 'plugin-install.php':
-			$default_action = array('plugins.php' => array(__('Manage Plugins'), 'activate_plugins'));
-			break;
-		case 'themes.php':
-			$default_action = array('theme-install.php' => array(__('Install Themes'), 'install_themes'));
-			break;
-		case 'theme-install.php':
-			$default_action = array('themes.php' => array(__('Manage Themes'), 'switch_themes'));
-			break;
-		default:
-			$default_action = array('post-new.php' => array(__('New Post'), 'edit_posts'));
-			break;
+	$default_action = false;
+
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	if ( isset($screen->post_type) ) {
+		$post_type_object = get_post_type_object($screen->post_type);
+		if ( 'add' != $screen->action )
+			$default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
+		else
+			$default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->name, $post_type_object->cap->edit_posts));
+	}
+
+	if ( !$default_action ) {
+		switch ( $screen->id ) {
+			case 'upload':
+				$default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));
+				break;
+			case 'media':
+				$default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
+				break;
+			case 'link-manager':
+			case 'link':
+				if ( 'add' != $screen->action )
+					$default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
+				else
+					$default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
+				break;
+			case 'users':
+				$default_action = array('user-new.php' => array(__('New User'), 'create_users'));
+				break;
+			case 'user':
+				$default_action = array('users.php' => array(__('Edit Users'), 'edit_users'));
+				break;
+			case 'plugins':
+				$default_action = array('plugin-install.php' => array(__('Install Plugins'), 'install_plugins'));
+				break;
+			case 'plugin-install':
+				$default_action = array('plugins.php' => array(__('Manage Plugins'), 'activate_plugins'));
+				break;
+			case 'themes':
+				$default_action = array('theme-install.php' => array(__('Install Themes'), 'install_themes'));
+				break;
+			case 'theme-install':
+				$default_action = array('themes.php' => array(__('Manage Themes'), 'switch_themes'));
+				break;
+			default:
+				$default_action = array('post-new.php' => array(__('New Post'), 'edit_posts'));
+				break;
+		}
 	}
 
 	$actions = array(
 		'post-new.php' => array(__('New Post'), 'edit_posts'),
 		'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'),
-		'page-new.php' => array(__('New Page'), 'edit_pages'),
+		'post-new.php?post_type=page' => array(__('New Page'), 'edit_pages'),
 		'media-new.php' => array(__('Upload'), 'upload_files'),
 		'edit-comments.php' => array(__('Comments'), 'moderate_comments')
 		);
@@ -3362,8 +3414,7 @@ function favorite_actions( $screen = null ) {
  * @param int $id The post id. If not supplied the global $post is used.
  *
  */
-function _draft_or_post_title($post_id = 0)
-{
+function _draft_or_post_title($post_id = 0) {
 	$title = get_the_title($post_id);
 	if ( empty($title) )
 		$title = __('(no title)');
@@ -3393,6 +3444,7 @@ function _admin_search_query() {
  *
  */
 function iframe_header( $title = '', $limit_styles = false ) {
+global $hook_suffix;
 ?><!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" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
@@ -3414,9 +3466,20 @@ function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_r
 do_action('admin_print_styles');
 do_action('admin_print_scripts');
 do_action('admin_head');
+
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 </head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>  class="no-js <?php echo $admin_body_class; ?>">
+<script type="text/javascript">
+//<![CDATA[
+(function(){
+var c = document.body.className;
+c = c.replace(/no-js/, 'js');
+document.body.className = c;
+})();
+//]]>
+</script>
 <?php
 }
 
@@ -3472,25 +3535,38 @@ function _post_states($post) {
 	}
 }
 
+/**
+ * Convert a screen string to a screen object
+ *
+ * @since 3.0.0
+ *
+ * @param string $screen The name of the screen
+ * @return object An object containing the safe screen name and id
+ */
+function convert_to_screen( $screen ) {
+	$screen = str_replace( array('.php', '-new', '-add' ), '', $screen);
+	$screen = (string) apply_filters( 'screen_meta_screen', $screen );
+	$screen = (object) array('id' => $screen, 'base' => $screen);
+	return $screen;
+}
+
 function screen_meta($screen) {
-	global $wp_meta_boxes, $_wp_contextual_help;
+	global $wp_meta_boxes, $_wp_contextual_help, $title;
 
-	$screen = str_replace('.php', '', $screen);
-	$screen = str_replace('-new', '', $screen);
-	$screen = str_replace('-add', '', $screen);
-	$screen = apply_filters('screen_meta_screen', $screen);
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
 
 	$column_screens = get_column_headers($screen);
 	$meta_screens = array('index' => 'dashboard');
 
-	if ( isset($meta_screens[$screen]) )
-		$screen = $meta_screens[$screen];
+	if ( isset($meta_screens[$screen->id]) ) {
+		$screen->id = $meta_screens[$screen->id];
+		$screen->base = $screen->id;
+	}
+
 	$show_screen = false;
-	$show_on_screen = false;
-	if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) {
+	if ( !empty($wp_meta_boxes[$screen->id]) || !empty($column_screens) )
 		$show_screen = true;
-		$show_on_screen = true;
-	}
 
 	$screen_options = screen_options($screen);
 	if ( $screen_options )
@@ -3499,109 +3575,68 @@ function screen_meta($screen) {
 	if ( !isset($_wp_contextual_help) )
 		$_wp_contextual_help = array();
 
-	$settings = '';
+	$settings = apply_filters('screen_settings', '', $screen);
 
-	switch ( $screen ) {
-		case 'post':
-			if ( !isset($_wp_contextual_help['post']) ) {
-				$help = drag_drop_help();
-				$help .= '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>') . '</p>';
-				$_wp_contextual_help['post'] = $help;
-			}
-			break;
-		case 'page':
-			if ( !isset($_wp_contextual_help['page']) ) {
-				$help = drag_drop_help();
-				$_wp_contextual_help['page'] = $help;
-			}
-			break;
-		case 'dashboard':
-			if ( !isset($_wp_contextual_help['dashboard']) ) {
-				$help = '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n";
-				$help .= drag_drop_help();
-				$_wp_contextual_help['dashboard'] = $help;
-			}
-			break;
-		case 'link':
-			if ( !isset($_wp_contextual_help['link']) ) {
-				$help = drag_drop_help();
-				$_wp_contextual_help['link'] = $help;
-			}
-			break;
-		case 'options-general':
-			if ( !isset($_wp_contextual_help['options-general']) )
-				$_wp_contextual_help['options-general'] = __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
-			break;
-		case 'theme-install':
-		case 'plugin-install':
-			if ( ( !isset($_GET['tab']) || 'dashboard' == $_GET['tab'] ) && !isset($_wp_contextual_help[$screen]) ) {
-				$help = plugins_search_help();
-				$_wp_contextual_help[$screen] = $help;
-			}
-			break;
+	switch ( $screen->id ) {
 		case 'widgets':
-			if ( !isset($_wp_contextual_help['widgets']) ) {
-				$help = widgets_help();
-				$_wp_contextual_help['widgets'] = $help;
-			}
 			$settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
 			$show_screen = true;
 			break;
 	}
+	if( ! empty( $settings ) )
+		$show_screen = true;
 ?>
 <div id="screen-meta">
-<?php
-	if ( $show_screen ) :
-?>
+<?php if ( $show_screen ) : ?>
 <div id="screen-options-wrap" class="hidden">
 	<form id="adv-settings" action="" method="post">
-<?php if ( $show_on_screen ) : ?>
-	<h5><?php _e('Show on screen') ?></h5>
-	<div class="metabox-prefs">
-<?php
-	if ( !meta_box_prefs($screen) && isset($column_screens) ) {
-		manage_columns_prefs($screen);
+	<?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?>
+		<h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
+		<div class="metabox-prefs">
+			<?php meta_box_prefs($screen); ?>
+			<br class="clear" />
+		</div>
+		<?php endif;
+		if ( ! empty($column_screens) ) : ?>
+		<h5><?php echo ( isset( $column_screens['_title'] ) ?  $column_screens['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
+		<div class="metabox-prefs">
+			<?php manage_columns_prefs($screen); ?>
+			<br class="clear" />
+		</div>
+	<?php endif;
+	echo screen_layout($screen);
+
+	if ( !empty( $screen_options ) ) {
+		?>
+		<h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
+		<?php
 	}
-?>
-	<br class="clear" />
-	</div>
-<?php endif; ?>
-<?php echo screen_layout($screen); ?>
-<?php echo $screen_options; ?>
-<?php echo $settings; ?>
+
+	echo $screen_options;
+	echo $settings; ?>
 <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
 </form>
 </div>
 
-<?php
-	endif;
-
-	global $title;
+<?php endif; // $show_screen
 
 	$_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen);
 	?>
 	<div id="contextual-help-wrap" class="hidden">
 	<?php
 	$contextual_help = '';
-	if ( isset($_wp_contextual_help[$screen]) ) {
-		if ( !empty($title) )
-			$contextual_help .= '<h5>' . sprintf(__('Get help with &#8220;%s&#8221;'), $title) . '</h5>';
-		else
-			$contextual_help .= '<h5>' . __('Get help with this page') . '</h5>';
-		$contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen] . "</div>\n";
-
-		$contextual_help .= '<h5>' . __('Other Help') . '</h5>';
+	if ( isset($_wp_contextual_help[$screen->id]) ) {
+		$contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen->id] . "</div>\n";
 	} else {
-		$contextual_help .= '<h5>' . __('Help') . '</h5>';
+		$contextual_help .= '<div class="metabox-prefs">';
+		$default_help = __('<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>');
+		$default_help .= '<br />';
+		$default_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>');
+		$contextual_help .= apply_filters('default_contextual_help', $default_help);
+		$contextual_help .= "</div>\n";
 	}
 
-	$contextual_help .= '<div class="metabox-prefs">';
-	$default_help = __('<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>');
-	$default_help .= '<br />';
-	$default_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>');
-	$contextual_help .= apply_filters('default_contextual_help', $default_help);
-	$contextual_help .= "</div>\n";
-	echo apply_filters('contextual_help', $contextual_help, $screen);
+	echo apply_filters('contextual_help', $contextual_help, $screen->id, $screen);
 	?>
 	</div>
 
@@ -3630,10 +3665,13 @@ function screen_meta($screen) {
 function add_contextual_help($screen, $help) {
 	global $_wp_contextual_help;
 
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
 	if ( !isset($_wp_contextual_help) )
 		$_wp_contextual_help = array();
 
-	$_wp_contextual_help[$screen] = $help;
+	$_wp_contextual_help[$screen->id] = $help;
 }
 
 function drag_drop_help() {
@@ -3653,28 +3691,27 @@ function plugins_search_help() {
 ';
 }
 
-function widgets_help() {
-	return '
-	<p>' . __('Widgets are added and arranged by simple drag &#8217;n&#8217; drop. If you hover your mouse over the titlebar of a widget, you&#8217;ll see a 4-arrow cursor which indicates that the widget is movable.  Click on the titlebar, hold down the mouse button and drag the widget to a sidebar. As you drag, you&#8217;ll see a dotted box that also moves. This box shows where the widget will go once you drop it.') . '</p>
-	<p>' . __('To remove a widget from a sidebar, drag it back to Available Widgets or click on the arrow on its titlebar to reveal its settings, and then click Remove.') . '</p>
-	<p>' . __('To remove a widget from a sidebar <em>and keep its configuration</em>, drag it to Inactive Widgets.') . '</p>
-	<p>' . __('The Inactive Widgets area stores widgets that are configured but not curently used. If you change themes and the new theme has fewer sidebars than the old, all extra widgets will be stored to Inactive Widgets automatically.') . '</p>
-';
-}
-
 function screen_layout($screen) {
 	global $screen_layout_columns;
 
-	$columns = array('dashboard' => 4, 'post' => 2, 'page' => 2, 'link' => 2);
-	$columns = apply_filters('screen_layout_columns', $columns, $screen);
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	$columns = array('dashboard' => 4, 'link' => 2);
+
+	// Add custom post types
+	foreach ( get_post_types( array('show_ui' => true) ) as $post_type )
+		$columns[$post_type] = 2;
 
-	if ( !isset($columns[$screen]) ) {
+	$columns = apply_filters('screen_layout_columns', $columns, $screen->id, $screen);
+
+	if ( !isset($columns[$screen->id]) ) {
 		$screen_layout_columns = 0;
 		return '';
  	}
 
-	$screen_layout_columns = get_user_option("screen_layout_$screen");
-	$num = $columns[$screen];
+	$screen_layout_columns = get_user_option("screen_layout_$screen->id");
+	$num = $columns[$screen->id];
 
 	if ( ! $screen_layout_columns )
 			$screen_layout_columns = 2;
@@ -3690,66 +3727,91 @@ function screen_layout($screen) {
 }
 
 function screen_options($screen) {
-	switch ( $screen ) {
+	if ( is_string($screen) )
+		$screen = convert_to_screen($screen);
+
+	switch ( $screen->base ) {
 		case 'edit':
-			$per_page_label = __('Posts per page:');
-			break;
 		case 'edit-pages':
-			$per_page_label = __('Pages per page:');
+			$post_type = 'post';
+			if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) )
+				$post_type = $_GET['post_type'];
+			$post_type_object = get_post_type_object($post_type);
+			$per_page_label = $post_type_object->labels->name;
+			break;
+		case 'ms-sites':
+			$per_page_label = _x( 'Sites', 'sites per page (screen options)' );
+			break;
+		case 'ms-users':
+			$per_page_label = _x( 'Users', 'users per page (screen options)' );
 			break;
 		case 'edit-comments':
-			$per_page_label = __('Comments per page:');
+			$per_page_label = _x( 'Comments', 'comments per page (screen options)' );
 			break;
 		case 'upload':
-			$per_page_label = __('Media items per page:');
-			break;
-		case 'categories':
-			$per_page_label = __('Categories per page:');
+			$per_page_label = _x( 'Media items', 'items per page (screen options)' );
 			break;
 		case 'edit-tags':
-			$per_page_label = __('Tags per page:');
+			global $tax;
+			$per_page_label = $tax->labels->name;
 			break;
 		case 'plugins':
-			$per_page_label = __('Plugins per page:');
+			$per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
 			break;
 		default:
 			return '';
 	}
 
-	$option = str_replace( '-', '_', "${screen}_per_page" );
-	$per_page = (int) get_user_option( $option, 0, false );
+	$option = str_replace( '-', '_', "{$screen->id}_per_page" );
+	if ( 'edit_tags_per_page' == $option ) {
+		if ( 'category' == $tax->name )
+			$option = 'categories_per_page';
+		elseif ( 'post_tag' != $tax->name )
+			$option = 'edit_' . $tax->name . '_per_page';
+	}
+
+	$per_page = (int) get_user_option( $option );
 	if ( empty( $per_page ) || $per_page < 1 ) {
-		if ( 'plugins' == $screen )
+		if ( 'plugins' == $screen->id )
 			$per_page = 999;
 		else
 			$per_page = 20;
 	}
+
 	if ( 'edit_comments_per_page' == $option )
 		$per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
-	elseif ( 'categories' == $option )
+	elseif ( 'categories_per_page' == $option )
 		$per_page = apply_filters( 'edit_categories_per_page', $per_page );
 	else
 		$per_page = apply_filters( $option, $per_page );
 
-	$return = '<h5>' . __('Options') . "</h5>\n";
-	$return .= "<div class='screen-options'>\n";
+	$return = "<div class='screen-options'>\n";
 	if ( !empty($per_page_label) )
-		$return .= "<label for='$option'>$per_page_label</label> <input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' />\n";
+		$return .= "<input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' /> <label for='$option'>$per_page_label</label>\n";
 	$return .= "<input type='submit' class='button' value='" . esc_attr__('Apply') . "' />";
 	$return .= "<input type='hidden' name='wp_screen_options[option]' value='" . esc_attr($option) . "' />";
 	$return .= "</div>\n";
 	return $return;
 }
 
-function screen_icon($name = '') {
-	global $parent_file, $hook_suffix;
+function screen_icon($screen = '') {
+	global $current_screen;
+
+	if ( empty($screen) )
+		$screen = $current_screen;
+	elseif ( is_string($screen) )
+		$name = $screen;
 
 	if ( empty($name) ) {
-		if ( isset($parent_file) && !empty($parent_file) )
-			$name = substr($parent_file, 0, -4);
+		if ( !empty($screen->parent_base) )
+			$name = $screen->parent_base;
 		else
-			$name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
+			$name = $screen->base;
+
+		if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type )
+			$name = 'edit-pages';
 	}
+
 ?>
 	<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
 <?php
@@ -3820,4 +3882,69 @@ function compression_test() {
 <?php
 }
 
+/**
+ * Set the current screen object
+ *
+ * @since 3.0.0
+ *
+ * @uses $current_screen
+ *
+ * @param string $id Screen id, optional.
+ */
+function set_current_screen( $id =  '' ) {
+	global $current_screen, $hook_suffix, $typenow, $taxnow;
+
+	$action = '';
+
+	if ( empty($id) ) {
+		$current_screen = $hook_suffix;
+		$current_screen = str_replace('.php', '', $current_screen);
+		if ( preg_match('/-add|-new$/', $current_screen) )
+			$action = 'add';
+		$current_screen = str_replace('-new', '', $current_screen);
+		$current_screen = str_replace('-add', '', $current_screen);
+		$current_screen = array('id' => $current_screen, 'base' => $current_screen);
+	} else {
+		$id = sanitize_key($id);
+		if ( false !== strpos($id, '-') ) {
+			list( $id, $typenow ) = explode('-', $id, 2);
+			if ( taxonomy_exists( $typenow ) ) {
+				$id = 'edit-tags';
+				$taxnow = $typenow;
+				$typenow = '';
+			}
+		}
+		$current_screen = array('id' => $id, 'base' => $id);
+	}
+
+	$current_screen = (object) $current_screen;
+
+	$current_screen->action = $action;
+
+	// Map index to dashboard
+	if ( 'index' == $current_screen->base )
+		$current_screen->base = 'dashboard';
+	if ( 'index' == $current_screen->id )
+		$current_screen->id = 'dashboard';
+
+	if ( 'edit' == $current_screen->id ) {
+		if ( empty($typenow) )
+			$typenow = 'post';
+		$current_screen->id .= '-' . $typenow;
+		$current_screen->post_type = $typenow;
+	} elseif ( 'post' == $current_screen->id ) {
+		if ( empty($typenow) )
+			$typenow = 'post';
+		$current_screen->id = $typenow;
+		$current_screen->post_type = $typenow;
+	} elseif ( 'edit-tags' == $current_screen->id ) {
+		if ( empty($taxnow) )
+			$taxnow = 'post_tag';
+		$current_screen->id = 'edit-' . $taxnow;
+		$current_screen->taxonomy = $taxnow;
+	}
+
+	$current_screen = apply_filters('current_screen', $current_screen);
+}
+
 ?>