Changes from branches/3.0/wp-admin/includes/template.php at r17412 to trunk/wp-admin/includes/template.php at r17410

File:

• trunk/wp-admin/includes/template.php (modified) (66 diffs)

trunk/wp-admin/includes/template.php

@@ -9 +9 @@
  */
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7
- *
- * Outputs the HTML for the hidden table rows used in Categories, Link Categories and Tags quick edit.
- *
- * @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, $taxonomy) {
-
-    $tax = get_taxonomy($taxonomy);
-    if ( ! current_user_can( $tax->cap->edit_terms ) )
-        return;
-
-    $columns = get_column_headers($type);
-    $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
-    $col_count = count($columns) - count($hidden);
-    ?>
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-    <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
-
-        <fieldset><div class="inline-edit-col">
-            <h4><?php _e( 'Quick Edit' ); ?></h4>
-
-            <label>
-                <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 } ?>
-
-        </div></fieldset>
-
-<?php
-
-    $core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
-
-    foreach ( $columns as $column_name => $column_display_name ) {
-        if ( isset( $core_columns[$column_name] ) )
-            continue;
-        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 = $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="<?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>
-    </tbody></table></form>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $category
- * @param unknown_type $name_override
- * @return unknown
- */
-function link_cat_row( $category, $name_override = false ) {
-    static $row_class = '';
-
-    if ( !$category = get_term( $category, 'link_category', OBJECT, 'display' ) )
-        return false;
-    if ( is_wp_error( $category ) )
-        return $category;
-
-    $default_cat_id = (int) get_option( 'default_link_category' );
-    $name = ( $name_override ? $name_override : $category->name );
-    $edit_link = "link-category.php?action=edit&amp;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)) . "'>$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:link-cat-$category->term_id submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "'>" . __('Delete') . "</a>";
-        $actions = apply_filters('link_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_term_to_edit($category->term_id, 'link_category');
-
-    $category->count = number_format_i18n( $category->count );
-    $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
-    $output = "<tr id='link-cat-$category->term_id' class='iedit $row_class'>";
-    $columns = get_column_headers('edit-link-categories');
-    $hidden = get_hidden_columns('edit-link-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 ( absint( get_option( 'default_link_category' ) ) != $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 'links':
-                $attributes = 'class="links column-links num"' . $style;
-                $output .= "<td $attributes>$count</td>";
-                break;
-            default:
-                $output .= "<td $attributes>";
-                $output .= apply_filters('manage_link_categories_custom_column', '', $column_name, $category->term_id);
-                $output .= "</td>";
-        }
-    }
-    $output .= '</tr>';
-
-    return $output;
-}
 
 //
@@ -180 +17 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.1
  */
 class Walker_Category_Checklist extends Walker {
@@ -218 +55 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.1
  *
  * @param unknown_type $post_id
@@ -240 +77 @@
  * Taxonomy independent version of wp_category_checklist
  *
+ * @since 3.0.0
+ *
  * @param int $post_id
  * @param array $args
@@ -306 +145 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.0
  *
  * @param unknown_type $taxonomy
@@ -354 +193 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.1
  *
  * @param unknown_type $link_id
@@ -383 +222 @@
 }
 
-// Tag stuff
-
-// Returns a single tag row (see tag_rows below)
-// Note: this is also used in admin-ajax.php!
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $tag
- * @param unknown_type $class
- * @return unknown
- */
-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 );
-        $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;
-        }
-
-        $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;post_type=$post_type&amp;tag_ID=$tag->term_id";
-
-        $out = '';
-        $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\"";
-
-            $style = '';
-            if ( in_array($column_name, $hidden) )
-                $style = ' style="display:none;"';
-
-            $attributes = "$class$style";
-
-            switch ($column_name) {
-                case 'cb':
-                    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();
-                    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">';
-                    foreach ( $actions as $action => $link ) {
-                        ++$i;
-                        ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                        $out .= "<span class='$action'>$link$sep</span>";
-                    }
-                    $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>';
-                    $out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
-                    break;
-                case 'description':
-                    $out .= "<td $attributes>$tag->description</td>";
-                    break;
-                case 'slug':
-                    $out .= "<td $attributes>" . apply_filters('editable_slug', $tag->slug) . "</td>";
-                    break;
-                case 'posts':
-                    $attributes = 'class="posts column-posts num"' . $style;
-                    $out .= "<td $attributes><a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a></td>";
-                    break;
-                default:
-                    $out .= "<td $attributes>";
-                    $out .= apply_filters("manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id);
-                    $out .= "</td>";
-            }
-        }
-
-        $out .= "</tr>\n";
-
-        return $out;
-}
-
-// Outputs appropriate rows for the Nth page of the Tag Management screen,
-// assuming M tags displayed at a time on the page
-// Returns the number of tags displayed
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- * @param unknown_type $pagesize
- * @param unknown_type $searchterms
- * @return unknown
- */
-function tag_rows( $page = 1, $pagesize = 20, $searchterms = '', $taxonomy = 'post_tag' ) {
-
-    // Get a page worth of tags
-    $start = ($page - 1) * $pagesize;
-
-    $args = array('offset' => $start, 'number' => $pagesize, 'hide_empty' => 0);
-
-    if ( !empty( $searchterms ) )
-        $args['search'] = $searchterms;
-
-    // convert it to table rows
-    $out = '';
-    $count = 0;
-    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.
-    }
-
-    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}}
- *
- * @since unknown
- *
- * @return unknown
- */
-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('Title', 'column name');
-    $posts_columns['author'] = __('Author');
-    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') ) && ( 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');
-
-    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;
-}
-
-// define the columns to display, the syntax is 'internal name' => 'display name'
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_manage_media_columns() {
-    $posts_columns = array();
-    $posts_columns['cb'] = '<input type="checkbox" />';
-    $posts_columns['icon'] = '';
-    /* translators: column name */
-    $posts_columns['media'] = _x('File', 'column name');
-    $posts_columns['author'] = __('Author');
-    //$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="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
-    //$posts_columns['comments'] = __('Comments');
-    /* translators: column name */
-    $posts_columns['date'] = _x('Date', 'column name');
-    $posts_columns = apply_filters('manage_media_columns', $posts_columns);
-
-    return $posts_columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_manage_pages_columns() {
-    return wp_manage_posts_columns();
-}
-
 /**
  * Get the column headers for a screen
  *
- * @since unknown
+ * @since 2.7.0
  *
  * @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($screen) {
+function get_column_headers( $screen ) {
+    if ( is_string( $screen ) )
+        $screen = convert_to_screen( $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[$screen->id]) )
-        return $_wp_column_headers[$screen->id];
-
-    switch ($screen->base) {
-        case 'edit':
-             $_wp_column_headers[$screen->id] = wp_manage_posts_columns( $screen );
-             break;
-        case 'edit-comments':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'author' => __('Author'),
-                /* translators: column name */
-                'comment' => _x('Comment', 'column name'),
-                //'date' => __('Submitted'),
-                'response' => __('In Response To')
-            );
-
-            break;
-        case 'link-manager':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'name' => __('Name'),
-                'url' => __('URL'),
-                'categories' => __('Categories'),
-                'rel' => __('Relationship'),
-                'visible' => __('Visible'),
-                'rating' => __('Rating')
-            );
-
-            break;
-        case 'upload':
-            $_wp_column_headers[$screen->id] = wp_manage_media_columns();
-            break;
-        case 'categories':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'name' => __('Name'),
-                'description' => __('Description'),
-                'slug' => __('Slug'),
-                'posts' => __('Posts')
-            );
-
-            break;
-        case 'edit-link-categories':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'name' => __('Name'),
-                'description' => __('Description'),
-                'slug' => __('Slug'),
-                'links' => __('Links')
-            );
-
-            break;
-        case 'edit-tags':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'name' => __('Name'),
-                'description' => __('Description'),
-                'slug' => __('Slug'),
-                'posts' => __('Posts')
-            );
-
-            break;
-        case 'users':
-            $_wp_column_headers[$screen->id] = array(
-                'cb' => '<input type="checkbox" />',
-                'username' => __('Username'),
-                'name' => __('Name'),
-                'email' => __('E-mail'),
-                'role' => __('Role'),
-                'posts' => __('Posts')
-            );
-            break;
-        default :
-            $_wp_column_headers[$screen->id] = array();
-    }
-
-    $_wp_column_headers[$screen->id] = apply_filters('manage_' . $screen->id . '_columns', $_wp_column_headers[$screen->id]);
-    return $_wp_column_headers[$screen->id];
-}
-
+    if ( !isset( $_wp_column_headers[ $screen->id ] ) ) {
+        $_wp_column_headers[ $screen->id ] = apply_filters( 'manage_' . $screen->id . '_columns', array() );
+    }
+
+    return $_wp_column_headers[ $screen->id ];
+}
+
+/**
+ * Get a list of hidden columns.
+ *
+ * @since 2.7.0
+ *
+ * @param string|object $screen The screen you want the hidden columns for
+ * @return array
+ */
+function get_hidden_columns( $screen ) {
+    if ( is_string( $screen ) )
+        $screen = convert_to_screen( $screen );
+
+    return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
+}
+
+// adds hidden fields with the data for use in the inline editor for posts and pages
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
- *
- * @param unknown_type $screen
- * @param unknown_type $id
- */
-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();
-
-    foreach ( $columns as $column_key => $column_display_name ) {
-        $class = ' class="manage-column';
-
-        $class .= " column-$column_key";
-
-        if ( 'cb' == $column_key )
-            $class .= ' check-column';
-        elseif ( in_array($column_key, array('posts', 'comments', 'links')) )
-            $class .= ' num';
-
-        $class .= '"';
-
-        $style = '';
-        if ( in_array($column_key, $hidden) )
-            $style = 'display:none;';
-
-        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>
-<?php }
-}
-
-/**
- * Register column headers for a particular screen.  The header names will be listed in the Screen Options.
- *
  * @since 2.7.0
- *
- * @param string $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions.
- * @param array $columns An array of columns with column IDs as the keys and translated column names as the values
- * @see get_column_headers(), print_column_headers(), get_hidden_columns()
- */
-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->id] = $columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $screen
- */
-function get_hidden_columns($screen) {
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    return (array) get_user_option( 'manage' . $screen->id. 'columnshidden' );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * Outputs the quick edit and bulk edit table rows for posts and pages
- *
- * @since 2.7
- *
- * @param string $screen
- */
-function inline_edit_row( $screen ) {
-    global $mode;
-
-    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 = 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($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 "$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 ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
-
-
-<?php
-
-if ( post_type_supports( $screen->post_type, 'title' ) ) :
-    if ( $bulk ) : ?>
-        <div id="bulk-title-div">
-            <div id="bulk-titles"></div>
-        </div>
-
-<?php else : // $bulk ?>
-
-        <label>
-            <span class="title"><?php _e( 'Title' ); ?></span>
-            <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
-        </label>
-
-        <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); ?>
-        </div>
-        <br class="clear" />
-
-<?php endif; // $bulk
-
-    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'] = __('&mdash; No Change &mdash;');
-            $authors_dropdown  = '<label>';
-            $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-            $authors_dropdown .= wp_dropdown_users( $users_opt );
-            $authors_dropdown .= '</label>';
-
-        endif; // authors
-?>
-
-<?php if ( !$bulk ) echo $authors_dropdown;
-endif; // post_type_supports author
-
-if ( !$bulk ) :
-?>
-
-        <div class="inline-edit-group">
-            <label class="alignleft">
-                <span class="title"><?php _e( 'Password' ); ?></span>
-                <span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
-            </label>
-
-            <em style="margin:5px 10px 0 0" class="alignleft">
-                <?php
-                /* translators: Between password field and private checkbox on post quick edit interface */
-                echo __( '&ndash;OR&ndash;' );
-                ?>
-            </em>
-            <label class="alignleft inline-edit-private">
-                <input type="checkbox" name="keep_private" value="private" />
-                <span class="checkbox-title"><?php echo __('Private'); ?></span>
-            </label>
-        </div>
-
-<?php endif; ?>
-
-    </div></fieldset>
-
-<?php if ( count($hierarchical_taxonomies) && !$bulk ) : ?>
-
-    <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
-
-<?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>
-        <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; // count($hierarchical_taxonomies) && !$bulk ?>
-
-    <fieldset class="inline-edit-col-right"><div class="inline-edit-col">
-
-<?php
-    if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-        echo $authors_dropdown;
-?>
-
-<?php if ( $post_type_object->hierarchical ) : ?>
-
-        <label>
-            <span class="title"><?php _e( 'Parent' ); ?></span>
-<?php
-    $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'] =  __('&mdash; No Change &mdash;');
-    $dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
-    wp_dropdown_pages($dropdown_args);
-?>
-        </label>
-
-<?php if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
-        if ( !$bulk ) : ?>
-
-        <label>
-            <span class="title"><?php _e( 'Order' ); ?></span>
-            <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
-        </label>
-
-<?php   endif; // !$bulk ?>
-
-        <label>
-            <span class="title"><?php _e( 'Template' ); ?></span>
-            <select name="page_template">
-<?php   if ( $bulk ) : ?>
-                <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
-    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 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 endforeach; //$flat_taxonomies as $taxonomy ?>
-
-<?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('&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('&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
-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('&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>
-                    <option value="future"><?php _e( 'Scheduled' ); ?></option>
-<?php if ( $bulk ) : ?>
-                    <option value="private"><?php _e('Private') ?></option>
-<?php endif; // $bulk ?>
-                <?php endif; ?>
-                    <option value="pending"><?php _e( 'Pending Review' ); ?></option>
-                    <option value="draft"><?php _e( 'Draft' ); ?></option>
-                </select>
-            </label>
-
-<?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( '&mdash; No Change &mdash;' ); ?></option>
-                    <option value="sticky"><?php _e( 'Sticky' ); ?></option>
-                    <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
-                </select>
-            </label>
-
-<?php   else : // $bulk ?>
-
-            <label class="alignleft">
-                <input type="checkbox" name="sticky" value="sticky" />
-                <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
-            </label>
-
-<?php   endif; // $bulk ?>
-
-<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_cap' ) ?>
-
-        </div>
-
-    </div></fieldset>
-
-<?php
-    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, $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 = __( '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="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-        <?php } else {
-            $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 esc_attr($m); ?>" />
-        <input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
-        <br class="clear" />
-    </p>
-    </td></tr>
-<?php
-    $bulk++;
-    } ?>
-    </tbody></table></form>
-<?php
-}
-
-// adds hidden fields with the data for use in the inline editor for posts and pages
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
  *
  * @param unknown_type $post
@@ -1186 +271 @@
         return;
 
-    $title = htmlspecialchars( trim( $post->post_title ), ENT_QUOTES );
+    $title = esc_textarea( trim( $post->post_title ) );
 
     echo '
@@ -1232 +317 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
- *
- * @param unknown_type $posts
- */
-function post_rows( $posts = array() ) {
-    global $wp_query, $post, $mode;
-
-    add_filter('the_title','esc_html');
-
-    // Create array of post IDs.
-    $post_ids = array();
-
-    if ( empty($posts) )
-        $posts = &$wp_query->posts;
-
-    foreach ( $posts as $a_post )
-        $post_ids[] = $a_post->ID;
-
-    $comment_pending_count = get_pending_comments_num($post_ids);
-
-    foreach ( $posts as $post ) {
-        if ( empty($comment_pending_count[$post->ID]) )
-            $comment_pending_count[$post->ID] = 0;
-
-        _post_row($post, $comment_pending_count[$post->ID], $mode);
-    }
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $a_post
- * @param unknown_type $pending_comments
- * @param unknown_type $mode
- */
-function _post_row($a_post, $pending_comments, $mode) {
-    global $post, $current_screen;
-    static $rowclass;
-
-    $global_post = $post;
-    $post = $a_post;
-    setup_postdata($post);
-
-    $rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-    $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( $current_screen );
-    $hidden = get_hidden_columns( $current_screen );
-    foreach ( $posts_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':
-        ?>
-        <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;
-
-        case 'date':
-            if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
-                $t_time = $h_time = __('Unpublished');
-                $time_diff = 0;
-            } else {
-                $t_time = get_the_time(__('Y/m/d g:i:s A'));
-                $m_time = $post->post_date;
-                $time = get_post_time('G', true, $post);
-
-                $time_diff = time() - $time;
-
-                if ( $time_diff > 0 && $time_diff < 24*60*60 )
-                    $h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
-                else
-                    $h_time = mysql2date(__('Y/m/d'), $m_time);
-            }
-
-            echo '<td ' . $attributes . '>';
-            if ( 'excerpt' == $mode )
-                echo apply_filters('post_date_column_time', $t_time, $post, $column_name, $mode);
-            else
-                echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>';
-            echo '<br />';
-            if ( 'publish' == $post->post_status ) {
-                _e('Published');
-            } elseif ( 'future' == $post->post_status ) {
-                if ( $time_diff > 0 )
-                    echo '<strong class="attention">' . __('Missed schedule') . '</strong>';
-                else
-                    _e('Scheduled');
-            } else {
-                _e('Last Modified');
-            }
-            echo '</td>';
-        break;
-
-        case 'title':
-            $attributes = 'class="post-title column-title"' . $style;
-        ?>
-        <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($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($post_type_object->cap->delete_post, $post->ID) ) {
-                if ( 'trash' == $post->post_status )
-                    $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 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 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($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>';
-            }
-            $actions = apply_filters('post_row_actions', $actions, $post);
-            $action_count = count($actions);
-            $i = 0;
-            echo '<div class="row-actions">';
-            foreach ( $actions as $action => $link ) {
-                ++$i;
-                ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-                echo "<span class='$action'>$link$sep</span>";
-            }
-            echo '</div>';
-
-            get_inline_data($post);
-        ?>
-        </td>
-        <?php
-        break;
-
-        case 'categories':
-        ?>
-        <td <?php echo $attributes ?>><?php
-            $categories = get_the_category();
-            if ( !empty( $categories ) ) {
-                $out = array();
-                foreach ( $categories as $c )
-                    $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');
-            }
-        ?></td>
-        <?php
-        break;
-
-        case 'tags':
-        ?>
-        <td <?php echo $attributes ?>><?php
-            $tags = get_the_tags($post->ID);
-            if ( !empty( $tags ) ) {
-                $out = array();
-                foreach ( $tags as $c )
-                    $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');
-            }
-        ?></td>
-        <?php
-        break;
-
-        case 'comments':
-        ?>
-        <td <?php echo $attributes ?>><div class="post-com-count-wrapper">
-        <?php
-            $pending_phrase = 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>');
-                if ( $pending_comments )
-                echo '</strong>';
-        ?>
-        </div></td>
-        <?php
-        break;
-
-        case 'author':
-        ?>
-        <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;
-
-        case 'control_view':
-        ?>
-        <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td>
-        <?php
-        break;
-
-        case 'control_edit':
-        ?>
-        <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($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;
-
-        default:
-        ?>
-        <td <?php echo $attributes ?>><?php do_action('manage_posts_custom_column', $column_name, $post->ID); ?></td>
-        <?php
-        break;
-    }
-}
-?>
-    </tr>
-<?php
-    $post = $global_post;
-}
-
-/*
- * display one row if the page doesn't have any children
- * otherwise, display the row and its children in subsequent rows
- */
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- * @param unknown_type $level
- */
-function display_page_row( $page, $level = 0 ) {
-    global $post, $current_screen;
-    static $rowclass;
-
-    $post = $page;
-    setup_postdata($page);
-
-    if ( 0 == $level && (int)$page->post_parent > 0 ) {
-        //sent level 0 by accident, by default, or because we don't know the actual level
-        $find_main_page = (int)$page->post_parent;
-        while ( $find_main_page > 0 ) {
-            $parent = get_page($find_main_page);
-
-            if ( is_null($parent) )
-                break;
-
-            $level++;
-            $find_main_page = (int)$parent->post_parent;
-
-            if ( !isset($parent_name) )
-                $parent_name = $parent->post_title;
-        }
-    }
-
-    $page->post_title = esc_html( $page->post_title );
-    $pad = str_repeat( '&#8212; ', $level );
-    $id = (int) $page->ID;
-    $rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-    $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 ) {
-    $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':
-        ?>
-        <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':
-        if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) {
-            $t_time = $h_time = __('Unpublished');
-            $time_diff = 0;
-        } else {
-            $t_time = get_the_time(__('Y/m/d g:i:s A'));
-            $m_time = $page->post_date;
-            $time = get_post_time('G', true);
-
-            $time_diff = time() - $time;
-
-            if ( $time_diff > 0 && $time_diff < 24*60*60 )
-                $h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
-            else
-                $h_time = mysql2date(__('Y/m/d'), $m_time);
-        }
-        echo '<td ' . $attributes . '>';
-        echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $page, $column_name, '') . '</abbr>';
-        echo '<br />';
-        if ( 'publish' == $page->post_status ) {
-            _e('Published');
-        } elseif ( 'future' == $page->post_status ) {
-            if ( $time_diff > 0 )
-                echo '<strong class="attention">' . __('Missed schedule') . '</strong>';
-            else
-                _e('Scheduled');
-        } else {
-            _e('Last Modified');
-        }
-        echo '</td>';
-        break;
-    case 'title':
-        $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($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($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($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("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("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($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>';
-        }
-        $actions = apply_filters('page_row_actions', $actions, $page);
-        $action_count = count($actions);
-
-        $i = 0;
-        echo '<div class="row-actions">';
-        foreach ( $actions as $action => $link ) {
-            ++$i;
-            ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-            echo "<span class='$action'>$link$sep</span>";
-        }
-        echo '</div>';
-
-        get_inline_data($post);
-        echo '</td>';
-        break;
-
-    case 'comments':
-        ?>
-        <td <?php echo $attributes ?>><div class="post-com-count-wrapper">
-        <?php
-        $left = get_pending_comments_num( $page->ID );
-        $pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
-        if ( $left )
-            echo '<strong>';
-        comments_number("<a href='edit-comments.php?p=$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=$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=$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>');
-        if ( $left )
-            echo '</strong>';
-        ?>
-        </div></td>
-        <?php
-        break;
-
-    case 'author':
-        ?>
-        <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;
-
-    default:
-        ?>
-        <td <?php echo $attributes ?>><?php do_action('manage_pages_custom_column', $column_name, $id); ?></td>
-        <?php
-        break;
-    }
-}
-?>
-
-</tr>
-
-<?php
-}
-
-/*
- * displays pages in hierarchical order with paging support
- */
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $pages
- * @param unknown_type $pagenum
- * @param unknown_type $per_page
- * @return unknown
- */
-function page_rows($pages, $pagenum = 1, $per_page = 20) {
-    global $wpdb;
-
-    $level = 0;
-
-    if ( ! $pages ) {
-        $pages = get_pages( array('sort_column' => 'menu_order') );
-
-        if ( ! $pages )
-            return false;
-    }
-
-    /*
-     * arrange pages into two parts: top level pages and children_pages
-     * children_pages is two dimensional array, eg.
-     * children_pages[10][] contains all sub-pages whose parent is 10.
-     * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations
-     * If searching, ignore hierarchy and treat everything as top level
-     */
-    if ( empty($_GET['s']) ) {
-
-        $top_level_pages = array();
-        $children_pages = array();
-
-        foreach ( $pages as $page ) {
-
-            // catch and repair bad pages
-            if ( $page->post_parent == $page->ID ) {
-                $page->post_parent = 0;
-                $wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
-                clean_page_cache( $page->ID );
-            }
-
-            if ( 0 == $page->post_parent )
-                $top_level_pages[] = $page;
-            else
-                $children_pages[ $page->post_parent ][] = $page;
-        }
-
-        $pages = &$top_level_pages;
-    }
-
-    $count = 0;
-    $start = ($pagenum - 1) * $per_page;
-    $end = $start + $per_page;
-
-    foreach ( $pages as $page ) {
-        if ( $count >= $end )
-            break;
-
-        if ( $count >= $start )
-            echo "\t" . display_page_row( $page, $level );
-
-        $count++;
-
-        if ( isset($children_pages) )
-            _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
-    }
-
-    // if it is the last pagenum and there are orphaned pages, display them with paging as well
-    if ( isset($children_pages) && $count < $end ){
-        foreach( $children_pages as $orphans ){
-            foreach ( $orphans as $op ) {
-                if ( $count >= $end )
-                    break;
-                if ( $count >= $start )
-                    echo "\t" . display_page_row( $op, 0 );
-                $count++;
-            }
-        }
-    }
-}
-
-/**
- * Given a top level page ID, display the nested hierarchy of sub-pages
- * together with paging support
- *
- * @since unknown
- *
- * @param unknown_type $children_pages
- * @param unknown_type $count
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $pagenum
- * @param unknown_type $per_page
- */
-function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
-
-    if ( ! isset( $children_pages[$parent] ) )
-        return;
-
-    $start = ($pagenum - 1) * $per_page;
-    $end = $start + $per_page;
-
-    foreach ( $children_pages[$parent] as $page ) {
-
-        if ( $count >= $end )
-            break;
-
-        // If the page starts in a subtree, print the parents.
-        if ( $count == $start && $page->post_parent > 0 ) {
-            $my_parents = array();
-            $my_parent = $page->post_parent;
-            while ( $my_parent) {
-                $my_parent = get_post($my_parent);
-                $my_parents[] = $my_parent;
-                if ( !$my_parent->post_parent )
-                    break;
-                $my_parent = $my_parent->post_parent;
-            }
-            $num_parents = count($my_parents);
-            while( $my_parent = array_pop($my_parents) ) {
-                echo "\t" . display_page_row( $my_parent, $level - $num_parents );
-                $num_parents--;
-            }
-        }
-
-        if ( $count >= $start )
-            echo "\t" . display_page_row( $page, $level );
-
-        $count++;
-
-        _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
-    }
-
-    unset( $children_pages[$parent] ); //required in order to keep track of orphans
-}
-
-/**
- * Generate HTML for a single row on the users.php admin panel.
- *
- * @since 2.1.0
- *
- * @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 = '', $numposts = 0 ) {
-    global $wp_roles;
-
-    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');
-    $email = $user_object->user_email;
-    $url = $user_object->user_url;
-    $short_url = str_replace( 'http://', '', $url );
-    $short_url = str_replace( 'www.', '', $short_url );
-    if ('/' == substr( $short_url, -1 ))
-        $short_url = substr( $short_url, 0, -1 );
-    if ( strlen( $short_url ) > 35 )
-        $short_url = substr( $short_url, 0, 32 ).'...';
-    $checkbox = '';
-    // Check if the user for this row is editable
-    if ( current_user_can( 'list_users' ) ) {
-        // Set up the user editing link
-        // 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" ) );
-        }
-        $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-
-        // Set up the hover actions for this user
-        $actions = array();
-
-        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;
-        $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>';
-
-        // Set up the checkbox (because the user is editable, otherwise its empty)
-        $checkbox = "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
-
-    } else {
-        $edit = '<strong>' . $user_object->user_login . '</strong>';
-    }
-    $role_name = isset($wp_roles->role_names[$role]) ? translate_user_role($wp_roles->role_names[$role] ) : __('None');
-    $r = "<tr id='user-$user_object->ID'$style>";
-    $columns = get_column_headers('users');
-    $hidden = get_hidden_columns('users');
-    $avatar = get_avatar( $user_object->ID, 32 );
-    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':
-                $r .= "<th scope='row' class='check-column'>$checkbox</th>";
-                break;
-            case 'username':
-                $r .= "<td $attributes>$avatar $edit</td>";
-                break;
-            case 'name':
-                $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>";
-                break;
-            case 'role':
-                $r .= "<td $attributes>$role_name</td>";
-                break;
-            case 'posts':
-                $attributes = 'class="posts column-posts num"' . $style;
-                $r .= "<td $attributes>";
-                if ( $numposts > 0 ) {
-                    $r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
-                    $r .= $numposts;
-                    $r .= '</a>';
-                } else {
-                    $r .= 0;
-                }
-                $r .= "</td>";
-                break;
-            default:
-                $r .= "<td $attributes>";
-                $r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
-                $r .= "</td>";
-        }
-    }
-    $r .= '</tr>';
-
-    return $r;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param string $status Comment status (approved, spam, trash, etc)
- * @param string $s Term to search for
- * @param int $start Offset to start at for pagination
- * @param int $num Maximum number of comments to return
- * @param int $post Post ID or 0 to return all comments
- * @param string $type Comment type (comment, trackback, pingback, etc)
- * @return array [0] contains the comments and [1] contains the total number of comments that match (ignoring $start and $num)
- */
-function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0, $type = '' ) {
-    global $wpdb;
-
-    $start = abs( (int) $start );
-    $num = (int) $num;
-    $post = (int) $post;
-    $count = wp_count_comments();
-    $index = '';
-
-    if ( 'moderated' == $status ) {
-        $approved = "c.comment_approved = '0'";
-        $total = $count->moderated;
-    } elseif ( 'approved' == $status ) {
-        $approved = "c.comment_approved = '1'";
-        $total = $count->approved;
-    } elseif ( 'spam' == $status ) {
-        $approved = "c.comment_approved = 'spam'";
-        $total = $count->spam;
-    } elseif ( 'trash' == $status ) {
-        $approved = "c.comment_approved = 'trash'";
-        $total = $count->trash;
-    } else {
-        $approved = "( c.comment_approved = '0' OR c.comment_approved = '1' )";
-        $total = $count->moderated + $count->approved;
-        $index = 'USE INDEX (c.comment_date_gmt)';
-    }
-
-    if ( $post ) {
-        $total = '';
-        $post = " AND c.comment_post_ID = '$post'";
-    } else {
-        $post = '';
-    }
-
-    $orderby = "ORDER BY c.comment_date_gmt DESC LIMIT $start, $num";
-
-    if ( 'comment' == $type )
-        $typesql = "AND c.comment_type = ''";
-    elseif ( 'pings' == $type )
-        $typesql = "AND ( c.comment_type = 'pingback' OR c.comment_type = 'trackback' )";
-    elseif ( 'all' == $type )
-        $typesql = '';
-    elseif ( !empty($type) )
-        $typesql = $wpdb->prepare("AND c.comment_type = %s", $type);
-    else
-        $typesql = '';
-
-    if ( !empty($type) )
-        $total = '';
-
-    $query = "FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ";
-    if ( $s ) {
-        $total = '';
-        $s = $wpdb->escape($s);
-        $query .= "AND
-            (c.comment_author LIKE '%$s%' OR
-            c.comment_author_email LIKE '%$s%' OR
-            c.comment_author_url LIKE ('%$s%') OR
-            c.comment_author_IP LIKE ('%$s%') OR
-            c.comment_content LIKE ('%$s%') ) AND
-            $approved
-            $typesql";
-    } else {
-        $query .= "AND $approved $post $typesql";
-    }
-
-    $comments = $wpdb->get_results("SELECT * $query $orderby");
-    if ( '' === $total )
-        $total = $wpdb->get_var("SELECT COUNT(c.comment_ID) $query");
-
-    update_comment_cache($comments);
-
-    return array($comments, $total);
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $comment_id
- * @param unknown_type $mode
- * @param unknown_type $comment_status
- * @param unknown_type $checkbox
- */
-function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) {
-    global $comment, $post, $_comment_pending_count;
-    $comment = get_comment( $comment_id );
-    $post = get_post($comment->comment_post_ID);
-    $the_comment_status = wp_get_comment_status($comment->comment_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 = '';
-    $author_url_display = preg_replace('|http://(www\.)?|i', '', $author_url);
-    if ( strlen($author_url_display) > 50 )
-        $author_url_display = substr($author_url_display, 0, 49) . '...';
-
-    $ptime = date('G', strtotime( $comment->comment_date ) );
-    if ( ( abs(time() - $ptime) ) < 86400 )
-        $ptime = sprintf( __('%s ago'), human_time_diff( $ptime ) );
-    else
-        $ptime = mysql2date(__('Y/m/d \a\t g:i A'), $comment->comment_date );
-
-    if ( $user_can ) {
-        $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-        $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
-
-        $approve_url = esc_url( "comment.php?action=approvecomment&p=$post->ID&c=$comment->comment_ID&$approve_nonce" );
-        $unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$post->ID&c=$comment->comment_ID&$approve_nonce" );
-        $spam_url = esc_url( "comment.php?action=spamcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-        $unspam_url = esc_url( "comment.php?action=unspamcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-        $trash_url = esc_url( "comment.php?action=trashcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-        $untrash_url = esc_url( "comment.php?action=untrashcomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-        $delete_url = esc_url( "comment.php?action=deletecomment&p=$post->ID&c=$comment->comment_ID&$del_nonce" );
-    }
-
-    echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>";
-    $columns = get_column_headers('edit-comments');
-    $hidden = get_hidden_columns('edit-comments');
-    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':
-                if ( !$checkbox ) break;
-                echo '<th scope="row" class="check-column">';
-                if ( $user_can ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
-                echo '</th>';
-                break;
-            case 'comment':
-                echo "<td $attributes>";
-                echo '<div id="submitted-on">';
-                /* 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 ) { ?>
-                <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-                <textarea class="comment" rows="1" cols="1"><?php echo htmlspecialchars( apply_filters('comment_edit_pre', $comment->comment_content), ENT_QUOTES ); ?></textarea>
-                <div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
-                <div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
-                <div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
-                <div class="comment_status"><?php echo $comment->comment_approved; ?></div>
-                </div>
-                <?php
-                }
-
-                if ( $user_can ) {
-                    // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
-                    $actions = array(
-                        'approve' => '', 'unapprove' => '',
-                        'reply' => '',
-                        'quickedit' => '',
-                        'edit' => '',
-                        'spam' => '', 'unspam' => '',
-                        'trash' => '', 'untrash' => '', 'delete' => ''
-                    );
-
-                    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='" . 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='" . 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='" . 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='" . 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='$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>';
-                    }
-
-                    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='" . 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='" . 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="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
-                    }
-
-                    $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
-
-                    $i = 0;
-                    echo '<div class="row-actions">';
-                    foreach ( $actions as $action => $link ) {
-                        ++$i;
-                        ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
-
-                        // Reply and quickedit need a hide-if-no-js span when not added with ajax
-                        if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax )
-                            $action .= ' hide-if-no-js';
-                        elseif ( ($action == 'untrash' && $the_comment_status == 'trash') || ($action == 'unspam' && $the_comment_status == 'spam') ) {
-                            if ('1' == get_comment_meta($comment_id, '_wp_trash_meta_status', true))
-                                $action .= ' approve';
-                            else
-                                $action .= ' unapprove';
-                        }
-
-                        echo "<span class='$action'>$sep$link</span>";
-                    }
-                    echo '</div>';
-                }
-
-                echo '</td>';
-                break;
-            case 'author':
-                echo "<td $attributes><strong>"; comment_author(); echo '</strong><br />';
-                if ( !empty($author_url) )
-                    echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
-                if ( $user_can ) {
-                    if ( !empty($comment->comment_author_email) ) {
-                        comment_author_email_link();
-                        echo '<br />';
-                    }
-                    echo '<a href="edit-comments.php?s=';
-                    comment_author_IP();
-                    echo '&amp;mode=detail';
-                    if ( 'spam' == $comment_status )
-                        echo '&amp;comment_status=spam';
-                    echo '">';
-                    comment_author_IP();
-                    echo '</a>';
-                } //current_user_can
-                echo '</td>';
-                break;
-            case 'date':
-                echo "<td $attributes>" . get_comment_date(__('Y/m/d \a\t g:ia')) . '</td>';
-                break;
-            case 'response':
-                if ( 'single' !== $mode ) {
-                    if ( isset( $_comment_pending_count[$post->ID] ) ) {
-                        $pending_comments = $_comment_pending_count[$post->ID];
-                    } else {
-                        $_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 ) {
-                        $post_link = "<a href='" . get_edit_post_link($post->ID) . "'>";
-                        $post_link .= get_the_title($post->ID) . '</a>';
-                    } else {
-                        $post_link = get_the_title($post->ID);
-                    }
-                    echo "<td $attributes>\n";
-                    echo '<div class="response-links"><span class="post-com-count-wrapper">';
-                    echo $post_link . '<br />';
-                    $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>');
-                    if ( $pending_comments )
-                        echo '</strong>';
-                    echo '</span> ';
-                    echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
-                    echo '</div>';
-                    if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) )
-                        echo $thumb;
-                    echo '</td>';
-                }
-                break;
-            default:
-                echo "<td $attributes>\n";
-                do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
-                echo "</td>\n";
-                break;
-        }
-    }
-    echo "</tr>\n";
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
+ * @since 2.7.0
  *
  * @param unknown_type $position
@@ -2232 +332 @@
     }
 
-    $columns = get_column_headers('edit-comments');
-    $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns('edit-comments') ) );
-    $col_count = count($columns) - count($hidden);
+    if ( $mode == 'single' ) {
+        $wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
+    } else {
+        $wp_list_table = _get_list_table('WP_Comments_List_Table');
+    }
 
 ?>
 <form method="get" action="">
 <?php if ( $table_row ) : ?>
-<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $col_count; ?>">
+<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
@@ -2313 +415 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.2.0
  *
  * @param unknown_type $meta
@@ -2356 +458 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.0
  *
  * @param unknown_type $entry
@@ -2388 +490 @@
 
     $entry['meta_key'] = esc_attr($entry['meta_key']);
-    $entry['meta_value'] = htmlspecialchars($entry['meta_value']); // using a <textarea />
+    $entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
     $entry['meta_id'] = (int) $entry['meta_id'];
 
@@ -2396 +498 @@
     $r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta[{$entry['meta_id']}][key]'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' />";
 
-    $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-add-meta=$update_nonce updatemeta' /></div>";
+    $r .= "\n\t\t<div class='submit'>";
+    $r .= get_submit_button( __( 'Delete' ), "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta", "deletemeta[{$entry['meta_id']}]", false, array( 'tabindex' => '6' ) );
+    $r .= "\n\t\t";
+    $r .= get_submit_button( __( 'Update' ), "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta" , 'updatemeta', false, array( 'tabindex' => '6' ) );
+    $r .= "</div>";
     $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
     $r .= "</td>";
@@ -2409 +513 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.2.0
  */
 function meta_form() {
@@ -2458 +562 @@
 
 <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 submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta', 'addmeta', false, array( 'id' => 'addmetasub', 'tabindex' => '9' ) ); ?>
 <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
@@ -2470 +574 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 0.71
  *
  * @param unknown_type $edit
@@ -2544 +648 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $default
@@ -2563 +667 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $default
@@ -2599 +703 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param unknown_type $id
@@ -2621 +725 @@
     <tr>
         <th scope="row"><?php _e( 'URL' ) ?></th>
-        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo wp_get_attachment_url(); ?></textarea></td>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo esc_textarea( wp_get_attachment_url() ); ?></textarea></td>
     </tr>
 <?php if ( $icon ) : ?>
@@ -2649 +753 @@
 
 /**
- * Print out <option> html elements for role selectors based on $wp_roles
- *
- * @package WordPress
- * @subpackage Administration
- * @since 2.1
- *
- * @uses $wp_roles
- * @param string $default slug for the role that should be already selected
+ * Print out <option> html elements for role selectors
+ *
+ * @since 2.1.0
+ *
+ * @param string $selected slug for the role that should be already selected
  */
 function wp_dropdown_roles( $selected = false ) {
@@ -2666 +767 @@
     foreach ( $editable_roles as $role => $details ) {
         $name = translate_user_role($details['name'] );
-        if ( $selected == $role ) // Make default first in list
+        if ( $selected == $role ) // preselect specified role
             $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
         else
@@ -2677 +778 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.3.0
  *
  * @param unknown_type $size
@@ -2697 +798 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.3.0
  *
  * @param unknown_type $bytes
@@ -2713 +814 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.5.0
  *
  * @return unknown
@@ -2727 +828 @@
  * Outputs the form used by the importers to accept the data to be imported
  *
- * @since 2.0
+ * @since 2.0.0
  *
  * @param string $action The action attribute for the form.
@@ -2747 +848 @@
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<p class="submit">
-<input type="submit" class="button" value="<?php esc_attr_e( 'Upload file and import' ); ?>" />
-</p>
+<?php submit_button( __('Upload file and import'), 'button' ); ?>
 </form>
 <?php
@@ -2778 +877 @@
 
     foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-    foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-        if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
-            continue;
-
-        // If a core box was previously added or removed by a plugin, don't add.
-        if ( 'core' == $priority ) {
-            // If core box previously deleted, don't add
-            if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+        foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
+            if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+                continue;
+
+            // If a core box was previously added or removed by a plugin, don't add.
+            if ( 'core' == $priority ) {
+                // If core box previously deleted, don't add
+                if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+                    return;
+                // If box was added with default priority, give it core priority to maintain sort order
+                if ( 'default' == $a_priority ) {
+                    $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
+                    unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
+                }
                 return;
-            // If box was added with default priority, give it core priority to maintain sort order
-            if ( 'default' == $a_priority ) {
-                $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
-                unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
             }
-            return;
+            // If no priority given and id already present, use existing priority
+            if ( empty($priority) ) {
+                $priority = $a_priority;
+            // else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority.
+            } elseif ( 'sorted' == $priority ) {
+                $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
+                $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
+                $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
+            }
+            // An id can be in only one priority and one context
+            if ( $priority != $a_priority || $context != $a_context )
+                unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
         }
-        // If no priority given and id already present, use existing priority
-        if ( empty($priority) ) {
-            $priority = $a_priority;
-        // else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority.
-        } elseif ( 'sorted' == $priority ) {
-            $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
-            $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
-            $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
-        }
-        // An id can be in only one priority and one context
-        if ( $priority != $a_priority || $context != $a_context )
-            unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
-    }
     }
 
@@ -2859 +958 @@
                     $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 '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
                     echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
                     echo '<div class="inside">' . "\n";
@@ -2902 +1001 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.7.0
  *
  * @param unknown_type $screen
@@ -2937 +1036 @@
  * Get Hidden Meta Boxes
  *
- * @since 2.7
+ * @since 2.7.0
  *
  * @param string|object $screen Screen identifier
@@ -2949 +1048 @@
 
     // Hide slug boxes by default
-    if ( !is_array( $hidden ) )
-        $hidden = array('slugdiv');
+    if ( !is_array( $hidden ) ) {
+        if ( 'post' == $screen->base || 'page' == $screen->base )
+            $hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
+        else
+            $hidden = array( 'slugdiv' );
+        $hidden = apply_filters('default_hidden_meta_boxes', $hidden, $screen);
+    }
 
     return $hidden;
@@ -3042 +1146 @@
  * @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
+ * @since 2.7.0
  *
  * @param string $page The slug name of the page whos settings sections you want to output
@@ -3072 +1176 @@
  * @global $wp_settings_fields Storage array of settings fields and their pages/sections
  *
- * @since unknown
+ * @since 2.7.0
  *
  * @param string $page Slug title of the admin page who's settings fields you want to show.
@@ -3109 +1213 @@
  * page is first accessed.
  *
+ * @since 3.0.0
+ *
  * @global array $wp_settings_errors Storage array of errors registered during this pageload
  *
@@ -3137 +1243 @@
  * pageload and returns them.
  *
- * If changes were just submitted ($_GET['updated']) and settings errors were saved
+ * If changes were just submitted ($_GET['settings-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.
@@ -3144 +1250 @@
  * 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)
+ *
+ * @since 3.0.0
  *
  * @global array $wp_settings_errors Storage array of errors registered during this pageload
@@ -3162 +1270 @@
     // 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') ) {
+    if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
         $settings_errors = get_transient('settings_errors');
         delete_transient('settings_errors');
@@ -3197 +1305 @@
  * settings when the user arrives at the settings page.
  *
+ * @since 3.0.0
+ *
  * @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;
+ */
+function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
+
+    if ($hide_on_update AND $_GET['settings-updated']) return;
 
     $settings_errors = get_settings_errors( $setting, $sanitize );
@@ -3224 +1333 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
- *
- * @param unknown_type $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 or they are special
-        if ( in_array( $column, $special ) )
-            continue;
-        if ( empty( $title ) )
-            continue;
-
-        if ( 'comments' == $column )
-            $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"' : '') . ' />';
-        echo "$title</label>\n";
-    }
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
+ * @since 2.7.0
  *
  * @param unknown_type $found_action
@@ -3270 +1351 @@
                 <label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
                 <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="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
                 <?php
@@ -3286 +1367 @@
         </div>
         <div class="find-box-buttons">
-            <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
-            <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
+            <input id="find-posts-close" type="button" class="button alignleft" value="<?php esc_attr_e('Close'); ?>" />
+            <?php submit_button( __( 'Select' ), 'button-primary alignright', 'find-posts-submit', false ); ?>
         </div>
     </div>
@@ -3310 +1391 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.7.0
  */
 function favorite_actions( $screen = null ) {
@@ -3317 +1398 @@
     if ( is_string($screen) )
         $screen = convert_to_screen($screen);
+
+    if ( $screen->is_user )
+        return;
 
     if ( isset($screen->post_type) ) {
@@ -3327 +1411 @@
 
     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;
+        if ( $screen->is_network ) {
+            $default_action = array('sites.php' => array( __('Sites'), 'manage_sites'));
+        } else {
+            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'),
-        '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')
+    if ( !$screen->is_network ) {
+        $actions = array(
+            'post-new.php' => array(__('New Post'), 'edit_posts'),
+            'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'),
+            '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')
+            );
+    } else {
+        $actions = array(
+            'sites.php' => array( __('Sites'), 'manage_sites'),
+            'users.php' => array( __('Users'), 'manage_network_users')
         );
+    }
 
     $default_key = array_keys($default_action);
@@ -3378 +1473 @@
         unset($actions[$default_key]);
     $actions = array_merge($default_action, $actions);
-    $actions = apply_filters('favorite_actions', $actions);
+    $actions = apply_filters( 'favorite_actions', $actions, $screen );
 
     $allowed_actions = array();
@@ -3412 +1507 @@
  *
  * @since 2.7.0
- * @param int $id The post id. If not supplied the global $post is used.
- *
- */
-function _draft_or_post_title($post_id = 0) {
+ * @param int $post_id The post id. If not supplied the global $post is used.
+ * @return string The post title if set
+ */
+function _draft_or_post_title( $post_id = 0 ) {
     $title = get_the_title($post_id);
     if ( empty($title) )
@@ -3433 +1528 @@
  */
 function _admin_search_query() {
-    echo isset($_GET['s']) ? esc_attr( stripslashes( $_GET['s'] ) ) : '';
+    echo isset($_REQUEST['s']) ? esc_attr( stripslashes( $_REQUEST['s'] ) ) : '';
 }
 
@@ -3445 +1540 @@
  */
 function iframe_header( $title = '', $limit_styles = false ) {
-global $hook_suffix;
+    show_admin_bar( false );
+    global $hook_suffix, $current_screen, $current_user, $admin_body_class, $wp_locale;
+    $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+    $admin_body_class .= ' iframe';
+
 ?><!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(); ?>>
@@ -3461 +1560 @@
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
+var userSettings = {
+        'url': '<?php echo SITECOOKIEPATH; ?>',
+        'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+        'time':'<?php echo time() ?>'
+    },
+    ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+    pagenow = '<?php echo $current_screen->id; ?>',
+    typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+    adminpage = '<?php echo $admin_body_class; ?>',
+    thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+    decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+    isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>
 <?php
+do_action('admin_enqueue_scripts', $hook_suffix);
+do_action("admin_print_styles-$hook_suffix");
 do_action('admin_print_styles');
+do_action("admin_print_scripts-$hook_suffix");
 do_action('admin_print_scripts');
+do_action("admin_head-$hook_suffix");
 do_action('admin_head');
-
-$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 </head>
@@ -3534 +1647 @@
         }
     }
+
+    if ( get_post_format( $post->ID ) )
+        echo ' - <span class="post-state-format">' . get_post_format_string( get_post_format( $post->ID ) ) . '</span>';
 }
 
@@ -3545 +1661 @@
  */
 function convert_to_screen( $screen ) {
-    $screen = str_replace( array('.php', '-new', '-add' ), '', $screen);
+    $screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
+
+    if ( is_network_admin() )
+        $screen .= '-network';
+    elseif ( is_user_admin() )
+        $screen .= '-user';
+
     $screen = (string) apply_filters( 'screen_meta_screen', $screen );
     $screen = (object) array('id' => $screen, 'base' => $screen);
@@ -3552 +1674 @@
 
 function screen_meta($screen) {
-    global $wp_meta_boxes, $_wp_contextual_help, $title;
+    global $wp_meta_boxes, $_wp_contextual_help, $wp_list_table, $wp_current_screen_options;
 
     if ( is_string($screen) )
         $screen = convert_to_screen($screen);
 
-    $column_screens = get_column_headers($screen);
+    $columns = get_column_headers( $screen );
+    $hidden = get_hidden_columns( $screen );
+
     $meta_screens = array('index' => 'dashboard');
 
@@ -3566 +1690 @@
 
     $show_screen = false;
-    if ( !empty($wp_meta_boxes[$screen->id]) || !empty($column_screens) )
+    if ( !empty($wp_meta_boxes[$screen->id]) || !empty($columns) )
         $show_screen = true;
 
@@ -3584 +1708 @@
             break;
     }
-    if( ! empty( $settings ) )
+    if ( ! empty( $settings ) )
         $show_screen = true;
+
+    if ( !empty($wp_current_screen_options) )
+        $show_screen = true;
+
 ?>
 <div id="screen-meta">
@@ -3598 +1726 @@
         </div>
         <?php endif;
-        if ( ! empty($column_screens) ) : ?>
-        <h5><?php echo ( isset( $column_screens['_title'] ) ?  $column_screens['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
+        if ( ! empty($columns) ) : ?>
+        <h5><?php echo ( isset( $columns['_title'] ) ?  $columns['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
         <div class="metabox-prefs">
-            <?php manage_columns_prefs($screen); ?>
+<?php
+    $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
+
+    foreach ( $columns as $column => $title ) {
+        // Can't hide these for they are special
+        if ( in_array( $column, $special ) )
+            continue;
+        if ( empty( $title ) )
+            continue;
+
+        if ( 'comments' == $column )
+            $title = __( 'Comments' );
+        $id = "$column-hide";
+        echo '<label for="' . $id . '">';
+        echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
+        echo "$title</label>\n";
+    }
+?>
             <br class="clear" />
         </div>
@@ -3675 +1820 @@
 }
 
-function drag_drop_help() {
-    return '
-    <p>' .  __('Most of the modules on this screen can be moved. If you hover your mouse over the title bar of a module you&rsquo;ll notice the 4 arrow cursor appears to let you know it is movable. Click on it, hold down the mouse button and start dragging the module to a new location. As you drag the module, notice the dotted gray box that also moves. This box indicates where the module will be placed when you release the mouse button.') . '</p>
-    <p>' . __('The same modules can be expanded and collapsed by clicking once on their title bar and also completely hidden from the Screen Options tab.') . '</p>
-';
-}
-
-function plugins_search_help() {
-    return '
-    <p><strong>' . __('Search help') . '</strong></p>' .
-    '<p>' . __('You may search based on 3 criteria:') . '<br />' .
-    __('<strong>Term:</strong> Searches theme names and descriptions for the specified term.') . '<br />' .
-    __('<strong>Tag:</strong> Searches for themes tagged as such.') . '<br />' .
-    __('<strong>Author:</strong> Searches for themes created by the Author, or which the Author contributed to.') . '</p>
-';
-}
-
 function screen_layout($screen) {
-    global $screen_layout_columns;
+    global $screen_layout_columns, $wp_current_screen_options;
 
     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;
-
-    $columns = apply_filters('screen_layout_columns', $columns, $screen->id, $screen);
-
-    if ( !isset($columns[$screen->id]) ) {
+    // Back compat for plugins using the filter instead of add_screen_option()
+    $columns = apply_filters('screen_layout_columns', array(), $screen->id, $screen);
+    if ( !empty($columns) && isset($columns[$screen->id]) )
+        add_screen_option('layout_columns', array('max' => $columns[$screen->id]) );
+
+    if ( !isset($wp_current_screen_options['layout_columns']) ) {
         $screen_layout_columns = 0;
         return '';
-    }
+    }
 
     $screen_layout_columns = get_user_option("screen_layout_$screen->id");
-    $num = $columns[$screen->id];
-
-    if ( ! $screen_layout_columns )
+    $num = $wp_current_screen_options['layout_columns']['max'];
+
+    if ( ! $screen_layout_columns ) {
+        if ( isset($wp_current_screen_options['layout_columns']['default']) )
+            $screen_layout_columns = $wp_current_screen_options['layout_columns']['default'];
+        else
             $screen_layout_columns = 2;
+    }
 
     $i = 1;
@@ -3727 +1856 @@
 }
 
+/**
+ * Register and configure an admin screen option
+ *
+ * @since 3.1.0
+ *
+ * @param string $option An option name.
+ * @param mixed $args Option dependent arguments
+ * @return void
+ */
+function add_screen_option( $option, $args = array() ) {
+    global $wp_current_screen_options;
+
+    if ( !isset($wp_current_screen_options) )
+        $wp_current_screen_options = array();
+
+    $wp_current_screen_options[$option] = $args;
+}
+
 function screen_options($screen) {
+    global $wp_current_screen_options;
+
     if ( is_string($screen) )
         $screen = convert_to_screen($screen);
 
-    switch ( $screen->base ) {
-        case 'edit':
-        case 'edit-pages':
-            $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 = _x( 'Comments', 'comments per page (screen options)' );
-            break;
-        case 'upload':
-            $per_page_label = _x( 'Media items', 'items per page (screen options)' );
-            break;
-        case 'edit-tags':
-            global $tax;
-            $per_page_label = $tax->labels->name;
-            break;
-        case 'plugins':
-            $per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
-            break;
-        default:
-            return '';
-    }
-
-    $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';
+    if ( !isset($wp_current_screen_options['per_page']) )
+        return '';
+
+    $per_page_label = $wp_current_screen_options['per_page']['label'];
+
+    if ( empty($wp_current_screen_options['per_page']['option']) ) {
+        $option = str_replace( '-', '_', "{$screen->id}_per_page" );
+    } else {
+        $option = $wp_current_screen_options['per_page']['option'];
     }
 
     $per_page = (int) get_user_option( $option );
     if ( empty( $per_page ) || $per_page < 1 ) {
-        if ( 'plugins' == $screen->id )
-            $per_page = 999;
+        if ( isset($wp_current_screen_options['per_page']['default']) )
+            $per_page = $wp_current_screen_options['per_page']['default'];
         else
             $per_page = 20;
@@ -3786 +1906 @@
         $per_page = apply_filters( $option, $per_page );
 
+    // Back compat
+    if ( isset( $screen->post_type ) )
+        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $screen->post_type );
+
     $return = "<div class='screen-options'>\n";
     if ( !empty($per_page_label) )
         $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 .= get_submit_button( __( 'Apply' ), 'button', 'screen-options-apply', false );
     $return .= "<input type='hidden' name='wp_screen_options[option]' value='" . esc_attr($option) . "' />";
     $return .= "</div>\n";
@@ -3796 +1920 @@
 
 function screen_icon($screen = '') {
-    global $current_screen;
+    global $current_screen, $typenow;
 
     if ( empty($screen) )
@@ -3802 +1926 @@
     elseif ( is_string($screen) )
         $name = $screen;
+
+    $class = 'icon32';
 
     if ( empty($name) ) {
@@ -3811 +1937 @@
         if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type )
             $name = 'edit-pages';
+
+        $post_type = '';
+        if ( isset( $screen->post_type ) )
+            $post_type = $screen->post_type;
+        elseif ( $current_screen == $screen )
+            $post_type = $typenow;
+        if ( $post_type )
+            $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $post_type );
     }
 
 ?>
-    <div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
+    <div id="icon-<?php echo $name; ?>" class="<?php echo $class; ?>"><br /></div>
 <?php
 }
@@ -3851 +1985 @@
                 }
 
-                x.open('GET', 'admin-ajax.php?action=wp-compression-test&test='+test+'&'+(new Date()).getTime(), true);
+                x.open('GET', ajaxurl + '?action=wp-compression-test&test='+test+'&'+(new Date()).getTime(), true);
                 x.send('');
             }
@@ -3881 +2015 @@
     </script>
 <?php
+}
+
+/**
+ *  Get the current screen object
+ *
+ *  @since 3.1.0
+ *
+ * @return object Current screen object
+ */
+function get_current_screen() {
+    global $current_screen;
+
+    if ( !isset($current_screen) )
+        return null;
+
+    return $current_screen;
 }
 
@@ -3945 +2095 @@
     }
 
+    $current_screen->is_network = is_network_admin();
+    $current_screen->is_user = is_user_admin();
+
+    if ( $current_screen->is_network ) {
+        $current_screen->base .= '-network';
+        $current_screen->id .= '-network';
+    } elseif ( $current_screen->is_user ) {
+        $current_screen->base .= '-user';
+        $current_screen->id .= '-user';
+    }
+
     $current_screen = apply_filters('current_screen', $current_screen);
 }
 
-?>
+/**
+ * Echos a submit button, with provided text and appropriate class
+ *
+ * @since 3.1.0
+ *
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit". If no id attribute
+ *               is given in $other_attributes below, $name will be used as the button's id.
+ * @param bool $wrap True if the output button should be wrapped in a paragraph tag,
+ *             false otherwise. Defaults to true
+ * @param array|string $other_attributes Other attributes that should be output with the button,
+ *                     mapping attributes to their values, such as array( 'tabindex' => '1' ).
+ *                     These attributes will be ouput as attribute="value", such as tabindex="1".
+ *                     Defaults to no other attributes. Other attributes can also be provided as a
+ *                     string such as 'tabindex="1"', though the array format is typically cleaner.
+ */
+function submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
+    echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
+}
+
+/**
+ * Returns a submit button, with provided text and appropriate class
+ *
+ * @since 3.1.0
+ *
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit". If no id attribute
+ *               is given in $other_attributes below, $name will be used as the button's id.
+ * @param bool $wrap True if the output button should be wrapped in a paragraph tag,
+ *             false otherwise. Defaults to true
+ * @param array|string $other_attributes Other attributes that should be output with the button,
+ *                     mapping attributes to their values, such as array( 'tabindex' => '1' ).
+ *                     These attributes will be ouput as attribute="value", such as tabindex="1".
+ *                     Defaults to no other attributes. Other attributes can also be provided as a
+ *                     string such as 'tabindex="1"', though the array format is typically cleaner.
+ */
+function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
+    switch ( $type ) :
+        case 'primary' :
+        case 'secondary' :
+            $class = 'button-' . $type;
+            break;
+        case 'delete' :
+            $class = 'button-secondary delete';
+            break;
+        default :
+            $class = $type; // Custom cases can just pass in the classes they want to be used
+    endswitch;
+    $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
+
+    // Default the id attribute to $name unless an id was specifically provided in $other_attributes
+    $id = $name;
+    if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
+        $id = $other_attributes['id'];
+        unset( $other_attributes['id'] );
+    }
+
+    $attributes = '';
+    if ( is_array( $other_attributes ) ) {
+        foreach ( $other_attributes as $attribute => $value ) {
+            $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
+        }
+    } else if ( !empty( $other_attributes ) ) { // Attributes provided as a string
+        $attributes = $other_attributes;
+    }
+
+    $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
+    $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+
+    if ( $wrap ) {
+        $button = '<p class="submit">' . $button . '</p>';
+    }
+
+    return $button;
+}
+