Changeset 18782

Timestamp:

09/26/2011 09:32:10 PM (13 years ago)

Author:

nacin

Message:

Move WP_Screen and friends (15 functions) into admin/includes/screen.php. see #18690.

Location:

trunk/wp-admin/includes

Files:

• admin.php (modified) (1 diff)
• screen.php (copied) (copied from trunk/wp-admin/includes/template.php) (6 diffs)
• template.php (modified) (6 diffs)

trunk/wp-admin/includes/admin.php

@@ -34 +34 @@
 require_once(ABSPATH . 'wp-admin/includes/post.php');
 
+/** WordPress Administration Screen API */
+require_once(ABSPATH . 'wp-admin/includes/screen.php');
+
 /** WordPress Taxonomy Administration API */
 require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');

trunk/wp-admin/includes/screen.php

@@ -1 +1 @@
 <?php
 /**
- * Template WordPress Administration API.
- *
- * A Big Mess. Also some neat functions that are nicely written.
+ * WordPress Administration Screen API.
  *
  * @package WordPress
  * @subpackage Administration
  */
-
-
-//
-// Category Checklists
-//
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.1
- */
-class Walker_Category_Checklist extends Walker {
-    var $tree_type = 'category';
-    var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
-
-    function start_lvl(&$output, $depth, $args) {
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent<ul class='children'>\n";
-    }
-
-    function end_lvl(&$output, $depth, $args) {
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent</ul>\n";
-    }
-
-    function start_el(&$output, $category, $depth, $args) {
-        extract($args);
-        if ( empty($taxonomy) )
-            $taxonomy = 'category';
-
-        if ( $taxonomy == 'category' )
-            $name = 'post_category';
-        else
-            $name = 'tax_input['.$taxonomy.']';
-
-        $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
-        $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
-    }
-
-    function end_el(&$output, $category, $depth, $args) {
-        $output .= "</li>\n";
-    }
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.1
- *
- * @param unknown_type $post_id
- * @param unknown_type $descendants_and_self
- * @param unknown_type $selected_cats
- * @param unknown_type $popular_cats
- */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
-    wp_terms_checklist($post_id,
-        array(
-            'taxonomy' => 'category',
-            'descendants_and_self' => $descendants_and_self,
-            'selected_cats' => $selected_cats,
-            'popular_cats' => $popular_cats,
-            'walker' => $walker,
-            'checked_ontop' => $checked_ontop
-  ));
-}
-
-/**
- * Taxonomy independent version of wp_category_checklist
- *
- * @since 3.0.0
- *
- * @param int $post_id
- * @param array $args
- */
-function wp_terms_checklist($post_id = 0, $args = array()) {
-    $defaults = array(
-        'descendants_and_self' => 0,
-        'selected_cats' => false,
-        'popular_cats' => false,
-        'walker' => null,
-        'taxonomy' => 'category',
-        'checked_ontop' => true
-    );
-    extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-
-    if ( empty($walker) || !is_a($walker, 'Walker') )
-        $walker = new Walker_Category_Checklist;
-
-    $descendants_and_self = (int) $descendants_and_self;
-
-    $args = array('taxonomy' => $taxonomy);
-
-    $tax = get_taxonomy($taxonomy);
-    $args['disabled'] = !current_user_can($tax->cap->assign_terms);
-
-    if ( is_array( $selected_cats ) )
-        $args['selected_cats'] = $selected_cats;
-    elseif ( $post_id )
-        $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
-    else
-        $args['selected_cats'] = array();
-
-    if ( is_array( $popular_cats ) )
-        $args['popular_cats'] = $popular_cats;
-    else
-        $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
-
-    if ( $descendants_and_self ) {
-        $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
-        $self = get_term( $descendants_and_self, $taxonomy );
-        array_unshift( $categories, $self );
-    } else {
-        $categories = (array) get_terms($taxonomy, array('get' => 'all'));
-    }
-
-    if ( $checked_ontop ) {
-        // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
-        $checked_categories = array();
-        $keys = array_keys( $categories );
-
-        foreach( $keys as $k ) {
-            if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
-                $checked_categories[] = $categories[$k];
-                unset( $categories[$k] );
-            }
-        }
-
-        // Put checked cats on top
-        echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
-    }
-    // Then the rest of them
-    echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @param unknown_type $taxonomy
- * @param unknown_type $default
- * @param unknown_type $number
- * @param unknown_type $echo
- * @return unknown
- */
-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
-    global $post_ID;
-
-    if ( $post_ID )
-        $checked_terms = wp_get_object_terms($post_ID, $taxonomy, array('fields'=>'ids'));
-    else
-        $checked_terms = array();
-
-    $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
-
-    $tax = get_taxonomy($taxonomy);
-    if ( ! current_user_can($tax->cap->assign_terms) )
-        $disabled = 'disabled="disabled"';
-    else
-        $disabled = '';
-
-    $popular_ids = array();
-    foreach ( (array) $terms as $term ) {
-        $popular_ids[] = $term->term_id;
-        if ( !$echo ) // hack for AJAX use
-            continue;
-        $id = "popular-$taxonomy-$term->term_id";
-        $checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
-        ?>
-
-        <li id="<?php echo $id; ?>" class="popular-category">
-            <label class="selectit">
-            <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled ?>/>
-                <?php echo esc_html( apply_filters( 'the_category', $term->name ) ); ?>
-            </label>
-        </li>
-
-        <?php
-    }
-    return $popular_ids;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.1
- *
- * @param unknown_type $link_id
- */
-function wp_link_category_checklist( $link_id = 0 ) {
-    $default = 1;
-
-    if ( $link_id ) {
-        $checked_categories = wp_get_link_cats( $link_id );
-        // No selected categories, strange
-        if ( ! count( $checked_categories ) )
-            $checked_categories[] = $default;
-    } else {
-        $checked_categories[] = $default;
-    }
-
-    $categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
-
-    if ( empty( $categories ) )
-        return;
-
-    foreach ( $categories as $category ) {
-        $cat_id = $category->term_id;
-        $name = esc_html( apply_filters( 'the_category', $category->name ) );
-        $checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
-        echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
-    }
-}
 
 /**
@@ -256 +41 @@
 
     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 2.7.0
- *
- * @param unknown_type $post
- */
-function get_inline_data($post) {
-    $post_type_object = get_post_type_object($post->post_type);
-    if ( ! current_user_can($post_type_object->cap->edit_post, $post->ID) )
-        return;
-
-    $title = esc_textarea( trim( $post->post_title ) );
-
-    echo '
-<div class="hidden" id="inline_' . $post->ID . '">
-    <div class="post_title">' . $title . '</div>
-    <div class="post_name">' . apply_filters('editable_slug', $post->post_name) . '</div>
-    <div class="post_author">' . $post->post_author . '</div>
-    <div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
-    <div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
-    <div class="_status">' . esc_html( $post->post_status ) . '</div>
-    <div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
-    <div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
-    <div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
-    <div class="hh">' . mysql2date( 'H', $post->post_date, false ) . '</div>
-    <div class="mn">' . mysql2date( 'i', $post->post_date, false ) . '</div>
-    <div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
-    <div class="post_password">' . esc_html( $post->post_password ) . '</div>';
-
-    if ( $post_type_object->hierarchical )
-        echo '<div class="post_parent">' . $post->post_parent . '</div>';
-
-    if ( $post->post_type == 'page' )
-        echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
-
-    if ( $post_type_object->hierarchical )
-        echo '<div class="menu_order">' . $post->menu_order . '</div>';
-
-    $taxonomy_names = get_object_taxonomies( $post->post_type );
-    foreach ( $taxonomy_names as $taxonomy_name) {
-        $taxonomy = get_taxonomy( $taxonomy_name );
-
-        if ( $taxonomy->hierarchical && $taxonomy->show_ui )
-                echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">' . implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array('fields'=>'ids')) ) . '</div>';
-        elseif ( $taxonomy->show_ui )
-            echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">' . esc_html( str_replace( ',', ', ', get_terms_to_edit($post->ID, $taxonomy_name) ) ) . '</div>';
-    }
-
-    if ( !$post_type_object->hierarchical )
-        echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
-
-    if ( post_type_supports( $post->post_type, 'post-formats' ) )
-        echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
-
-    echo '</div>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @param unknown_type $position
- * @param unknown_type $checkbox
- * @param unknown_type $mode
- */
-function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
-    // allow plugin to replace the popup content
-    $content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) );
-
-    if ( ! empty($content) ) {
-        echo $content;
-        return;
-    }
-
-    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 $wp_list_table->get_column_count(); ?>" class="colspanchange">
-<?php else : ?>
-<div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
-<?php endif; ?>
-    <div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
-
-    <div id="edithead" style="display:none;">
-        <div class="inside">
-        <label for="author"><?php _e('Name') ?></label>
-        <input type="text" name="newcomment_author" size="50" value="" tabindex="101" id="author" />
-        </div>
-
-        <div class="inside">
-        <label for="author-email"><?php _e('E-mail') ?></label>
-        <input type="text" name="newcomment_author_email" size="50" value="" tabindex="102" id="author-email" />
-        </div>
-
-        <div class="inside">
-        <label for="author-url"><?php _e('URL') ?></label>
-        <input type="text" id="author-url" name="newcomment_author_url" size="103" value="" tabindex="103" />
-        </div>
-        <div style="clear:both;"></div>
-    </div>
-
-    <div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div>
-
-    <p id="replysubmit" class="submit">
-    <a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a>
-    <a href="#comments-form" class="save button-primary alignright" tabindex="104">
-    <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
-    <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
-    <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-    <span class="error" style="display:none;"></span>
-    <br class="clear" />
-    </p>
-
-    <input type="hidden" name="user_ID" id="user_ID" value="<?php echo get_current_user_id(); ?>" />
-    <input type="hidden" name="action" id="action" value="" />
-    <input type="hidden" name="comment_ID" id="comment_ID" value="" />
-    <input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" />
-    <input type="hidden" name="status" id="status" value="" />
-    <input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
-    <input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
-    <input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
-    <?php wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false ); ?>
-    <?php wp_comment_form_unfiltered_html_nonce(); ?>
-<?php if ( $table_row ) : ?>
-</td></tr></tbody></table>
-<?php else : ?>
-</div></div>
-<?php endif; ?>
-</form>
-<?php
-}
-
-/**
- * Output 'undo move to trash' text for comments
- *
- * @since 2.9.0
- */
-function wp_comment_trashnotice() {
-?>
-<div class="hidden" id="trash-undo-holder">
-    <div class="trash-undo-inside"><?php printf(__('Comment by %s moved to the trash.'), '<strong></strong>'); ?> <span class="undo untrash"><a href="#"><?php _e('Undo'); ?></a></span></div>
-</div>
-<div class="hidden" id="spam-undo-holder">
-    <div class="spam-undo-inside"><?php printf(__('Comment by %s marked as spam.'), '<strong></strong>'); ?> <span class="undo unspam"><a href="#"><?php _e('Undo'); ?></a></span></div>
-</div>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 1.2.0
- *
- * @param unknown_type $meta
- */
-function list_meta( $meta ) {
-    // Exit if no meta
-    if ( ! $meta ) {
-        echo '
-<table id="list-table" style="display: none;">
-    <thead>
-    <tr>
-        <th class="left">' . _x( 'Name', 'meta name' ) . '</th>
-        <th>' . __( 'Value' ) . '</th>
-    </tr>
-    </thead>
-    <tbody id="the-list" class="list:meta">
-    <tr><td></td></tr>
-    </tbody>
-</table>'; //TBODY needed for list-manipulation JS
-        return;
-    }
-    $count = 0;
-?>
-<table id="list-table">
-    <thead>
-    <tr>
-        <th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
-        <th><?php _e( 'Value' ) ?></th>
-    </tr>
-    </thead>
-    <tbody id='the-list' class='list:meta'>
-<?php
-    foreach ( $meta as $entry )
-        echo _list_meta_row( $entry, $count );
-?>
-    </tbody>
-</table>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @param unknown_type $entry
- * @param unknown_type $count
- * @return unknown
- */
-function _list_meta_row( $entry, &$count ) {
-    static $update_nonce = false;
-
-    if ( is_protected_meta( $entry['meta_key'], 'post' ) )
-        return;
-
-    if ( !$update_nonce )
-        $update_nonce = wp_create_nonce( 'add-meta' );
-
-    $r = '';
-    ++ $count;
-    if ( $count % 2 )
-        $style = 'alternate';
-    else
-        $style = '';
-
-    if ( is_serialized( $entry['meta_value'] ) ) {
-        if ( is_serialized_string( $entry['meta_value'] ) ) {
-            // this is a serialized string, so we should display it
-            $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
-        } else {
-            // this is a serialized array/object so we should NOT display it
-            --$count;
-            return;
-        }
-    }
-
-    $entry['meta_key'] = esc_attr($entry['meta_key']);
-    $entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
-    $entry['meta_id'] = (int) $entry['meta_id'];
-
-    $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
-
-    $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
-    $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'>";
-    $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>";
-
-    $r .= "\n\t\t<td><label class='screen-reader-text' for='meta[{$entry['meta_id']}][value]'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
-    return $r;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 1.2.0
- */
-function meta_form() {
-    global $wpdb;
-    $limit = (int) apply_filters( 'postmeta_form_limit', 30 );
-    $keys = $wpdb->get_col( "
-        SELECT meta_key
-        FROM $wpdb->postmeta
-        GROUP BY meta_key
-        HAVING meta_key NOT LIKE '\_%'
-        ORDER BY meta_key
-        LIMIT $limit" );
-    if ( $keys )
-        natcasesort($keys);
-?>
-<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
-<table id="newmeta">
-<thead>
-<tr>
-<th class="left"><label for="metakeyselect"><?php _ex( 'Name', 'meta name' ) ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td id="newmetaleft" class="left">
-<?php if ( $keys ) { ?>
-<select id="metakeyselect" name="metakeyselect" tabindex="7">
-<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-<?php
-
-    foreach ( $keys as $key ) {
-        echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
-    }
-?>
-</select>
-<input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" />
-<a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
-<span id="enternew"><?php _e('Enter new'); ?></span>
-<span id="cancelnew" class="hidden"><?php _e('Cancel'); ?></span></a>
-<?php } else { ?>
-<input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" />
-<?php } ?>
-</td>
-<td><textarea id="metavalue" name="metavalue" rows="2" cols="25" tabindex="8"></textarea></td>
-</tr>
-
-<tr><td colspan="2" class="submit">
-<?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>
-</tbody>
-</table>
-<?php
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 0.71
- *
- * @param unknown_type $edit
- * @param unknown_type $for_post
- * @param unknown_type $tab_index
- * @param unknown_type $multi
- */
-function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
-    global $wp_locale, $post, $comment;
-
-    if ( $for_post )
-        $edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
-
-    $tab_index_attribute = '';
-    if ( (int) $tab_index > 0 )
-        $tab_index_attribute = " tabindex=\"$tab_index\"";
-
-    // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
-
-    $time_adj = current_time('timestamp');
-    $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
-    $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
-    $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
-    $aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-    $hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-    $mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-    $ss = ($edit) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
-
-    $cur_jj = gmdate( 'd', $time_adj );
-    $cur_mm = gmdate( 'm', $time_adj );
-    $cur_aa = gmdate( 'Y', $time_adj );
-    $cur_hh = gmdate( 'H', $time_adj );
-    $cur_mn = gmdate( 'i', $time_adj );
-
-    $month = "<select " . ( $multi ? '' : 'id="mm" ' ) . "name=\"mm\"$tab_index_attribute>\n";
-    for ( $i = 1; $i < 13; $i = $i +1 ) {
-        $month .= "\t\t\t" . '<option value="' . zeroise($i, 2) . '"';
-        if ( $i == $mm )
-            $month .= ' selected="selected"';
-        $month .= '>' . $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n";
-    }
-    $month .= '</select>';
-
-    $day = '<input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
-    $year = '<input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" />';
-    $hour = '<input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
-    $minute = '<input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
-
-    echo '<div class="timestamp-wrap">';
-    /* translators: 1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input */
-    printf(__('%1$s%2$s, %3$s @ %4$s : %5$s'), $month, $day, $year, $hour, $minute);
-
-    echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
-
-    if ( $multi ) return;
-
-    echo "\n\n";
-    foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit ) {
-        echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $$timeunit . '" />' . "\n";
-        $cur_timeunit = 'cur_' . $timeunit;
-        echo '<input type="hidden" id="'. $cur_timeunit . '" name="'. $cur_timeunit . '" value="' . $$cur_timeunit . '" />' . "\n";
-    }
-?>
-
-<p>
-<a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e('OK'); ?></a>
-<a href="#edit_timestamp" class="cancel-timestamp hide-if-no-js"><?php _e('Cancel'); ?></a>
-</p>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 1.5.0
- *
- * @param unknown_type $default
- */
-function page_template_dropdown( $default = '' ) {
-    $templates = get_page_templates();
-    ksort( $templates );
-    foreach (array_keys( $templates ) as $template )
-        : if ( $default == $templates[$template] )
-            $selected = " selected='selected'";
-        else
-            $selected = '';
-    echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
-    endforeach;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 1.5.0
- *
- * @param unknown_type $default
- * @param unknown_type $parent
- * @param unknown_type $level
- * @return unknown
- */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
-    global $wpdb, $post_ID;
-    $items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
-
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            // A page cannot be its own parent.
-            if (!empty ( $post_ID ) ) {
-                if ( $item->ID == $post_ID ) {
-                    continue;
-                }
-            }
-            $pad = str_repeat( '&nbsp;', $level * 3 );
-            if ( $item->ID == $default)
-                $current = ' selected="selected"';
-            else
-                $current = '';
-
-            echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
-            parent_dropdown( $default, $item->ID, $level +1 );
-        }
-    } else {
-        return false;
-    }
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.0.0
- *
- * @param unknown_type $id
- * @return unknown
- */
-function the_attachment_links( $id = false ) {
-    $id = (int) $id;
-    $post = & get_post( $id );
-
-    if ( $post->post_type != 'attachment' )
-        return false;
-
-    $icon = wp_get_attachment_image( $post->ID, 'thumbnail', true );
-    $attachment_data = wp_get_attachment_metadata( $id );
-    $thumb = isset( $attachment_data['thumb'] );
-?>
-<form id="the-attachment-links">
-<table>
-    <col />
-    <col class="widefat" />
-    <tr>
-        <th scope="row"><?php _e( 'URL' ) ?></th>
-        <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 ) : ?>
-    <tr>
-        <th scope="row"><?php $thumb ? _e( 'Thumbnail linked to file' ) : _e( 'Image linked to file' ); ?></th>
-        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $icon ?></a></textarea></td>
-    </tr>
-    <tr>
-        <th scope="row"><?php $thumb ? _e( 'Thumbnail linked to page' ) : _e( 'Image linked to page' ); ?></th>
-        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
-    </tr>
-<?php else : ?>
-    <tr>
-        <th scope="row"><?php _e( 'Link to file' ) ?></th>
-        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() ); ?></a></textarea></td>
-    </tr>
-    <tr>
-        <th scope="row"><?php _e( 'Link to page' ) ?></th>
-        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
-    </tr>
-<?php endif; ?>
-</table>
-</form>
-<?php
-}
-
-
-/**
- * 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 ) {
-    $p = '';
-    $r = '';
-
-    $editable_roles = get_editable_roles();
-
-    foreach ( $editable_roles as $role => $details ) {
-        $name = translate_user_role($details['name'] );
-        if ( $selected == $role ) // preselect specified role
-            $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
-        else
-            $r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
-    }
-    echo $p . $r;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.3.0
- *
- * @param unknown_type $size
- * @return unknown
- */
-function wp_convert_hr_to_bytes( $size ) {
-    $size = strtolower($size);
-    $bytes = (int) $size;
-    if ( strpos($size, 'k') !== false )
-        $bytes = intval($size) * 1024;
-    elseif ( strpos($size, 'm') !== false )
-        $bytes = intval($size) * 1024 * 1024;
-    elseif ( strpos($size, 'g') !== false )
-        $bytes = intval($size) * 1024 * 1024 * 1024;
-    return $bytes;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.3.0
- *
- * @param unknown_type $bytes
- * @return unknown
- */
-function wp_convert_bytes_to_hr( $bytes ) {
-    $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB' );
-    $log = log( $bytes, 1024 );
-    $power = (int) $log;
-    $size = pow(1024, $log - $power);
-    return $size . $units[$power];
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function wp_max_upload_size() {
-    $u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
-    $p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
-    $bytes = apply_filters( 'upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes );
-    return $bytes;
-}
-
-/**
- * Outputs the form used by the importers to accept the data to be imported
- *
- * @since 2.0.0
- *
- * @param string $action The action attribute for the form.
- */
-function wp_import_upload_form( $action ) {
-    $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-    $size = wp_convert_bytes_to_hr( $bytes );
-    $upload_dir = wp_upload_dir();
-    if ( ! empty( $upload_dir['error'] ) ) :
-        ?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
-        <p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
-    else :
-?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
-<p>
-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
-<input type="file" id="upload" name="import" size="25" />
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
-</p>
-<?php submit_button( __('Upload file and import'), 'button' ); ?>
-</form>
-<?php
-    endif;
-}
-
-/**
- * Add a meta box to an edit form.
- *
- * @since 2.5.0
- *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $title Title of the meta box.
- * @param string $callback Function that fills the box with the desired content. The function should echo its output.
- * @param string $page The type of edit page on which to show the box (post, page, link).
- * @param string $context The context within the page where the boxes should show ('normal', 'advanced').
- * @param string $priority The priority within the context where the boxes should show ('high', 'low').
- */
-function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args=null) {
-    global $wp_meta_boxes;
-
-    if ( !isset($wp_meta_boxes) )
-        $wp_meta_boxes = array();
-    if ( !isset($wp_meta_boxes[$page]) )
-        $wp_meta_boxes[$page] = array();
-    if ( !isset($wp_meta_boxes[$page][$context]) )
-        $wp_meta_boxes[$page][$context] = array();
-
-    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] )
-                    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 priority, we don't know the title or callback. Grab 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 ( empty($priority) )
-        $priority = 'low';
-
-    if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
-        $wp_meta_boxes[$page][$context][$priority] = array();
-
-    $wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
-}
-
-/**
- * Meta-Box template function
- *
- * @since 2.5.0
- *
- * @param string $page page identifier, also known as screen identifier
- * @param string $context box context
- * @param mixed $object gets passed to the box callback function as first parameter
- * @return int number of meta_boxes
- */
-function do_meta_boxes($page, $context, $object) {
-    global $wp_meta_boxes;
-    static $already_sorted = false;
-
-    $hidden = get_hidden_meta_boxes($page);
-
-    printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
-
-    $i = 0;
-    do {
-        // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-            foreach ( $sorted as $box_context => $ids ) {
-                foreach ( explode(',', $ids ) as $id ) {
-                    if ( $id && 'dashboard_browser_nag' !== $id )
-                        add_meta_box( $id, null, null, $page, $box_context, 'sorted' );
-                }
-            }
-        }
-        $already_sorted = true;
-
-        if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) )
-            break;
-
-        foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) {
-            if ( isset($wp_meta_boxes[$page][$context][$priority]) ) {
-                foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
-                    if ( false == $box || ! $box['title'] )
-                        continue;
-                    $i++;
-                    $style = '';
-                    $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";
-                    if ( 'dashboard_browser_nag' != $box['id'] )
-                        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";
-                    call_user_func($box['callback'], $object, $box);
-                    echo "</div>\n";
-                    echo "</div>\n";
-                }
-            }
-        }
-    } while(0);
-
-    echo "</div>";
-
-    return $i;
-
-}
-
-/**
- * Remove a meta box from an edit form.
- *
- * @since 2.6.0
- *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $page The type of edit page on which to show the box (post, page, link).
- * @param string $context The context within the page where the boxes should show ('normal', 'advanced').
- */
-function remove_meta_box($id, $page, $context) {
-    global $wp_meta_boxes;
-
-    if ( !isset($wp_meta_boxes) )
-        $wp_meta_boxes = array();
-    if ( !isset($wp_meta_boxes[$page]) )
-        $wp_meta_boxes[$page] = array();
-    if ( !isset($wp_meta_boxes[$page][$context]) )
-        $wp_meta_boxes[$page][$context] = array();
-
-    foreach ( array('high', 'core', 'default', 'low') as $priority )
-        $wp_meta_boxes[$page][$context][$priority][$id] = false;
 }
 
@@ -1068 +105 @@
 
 /**
- * Add a new section to a settings page.
- *
- * Part of the Settings API. Use this to define new settings sections for an admin page.
- * Show settings sections in your admin page callback function with do_settings_sections().
- * Add settings fields to your section with add_settings_field()
- *
- * The $callback argument should be the name of a function that echoes out any
- * content you want to show at the top of the settings section before the actual
- * fields. It can output nothing if you want.
- *
- * @since 2.7.0
- *
- * @global $wp_settings_sections Storage array of all settings sections added to admin pages
- *
- * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
- * @param string $title Formatted title of the section. Shown as the heading for the section.
- * @param string $callback Function that echos out any content at the top of the section (between heading and fields).
- * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
- */
-function add_settings_section($id, $title, $callback, $page) {
-    global $wp_settings_sections;
-
-    if ( 'misc' == $page ) {
-        _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
-        $page = 'general';
-    }
-
-    if ( !isset($wp_settings_sections) )
-        $wp_settings_sections = array();
-    if ( !isset($wp_settings_sections[$page]) )
-        $wp_settings_sections[$page] = array();
-    if ( !isset($wp_settings_sections[$page][$id]) )
-        $wp_settings_sections[$page][$id] = array();
-
-    $wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
-}
-
-/**
- * Add a new field to a section of a settings page
- *
- * Part of the Settings API. Use this to define a settings field that will show
- * as part of a settings section inside a settings page. The fields are shown using
- * do_settings_fields() in do_settings-sections()
- *
- * The $callback argument should be the name of a function that echoes out the
- * html input tags for this setting field. Use get_option() to retrieve existing
- * values to show.
- *
- * @since 2.7.0
- *
- * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
- *
- * @param string $id Slug-name to identify the field. Used in the 'id' attribute of tags.
- * @param string $title Formatted title of the field. Shown as the label for the field during output.
- * @param string $callback Function that fills the field with the desired form inputs. The function should echo its output.
- * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
- * @param string $section The slug-name of the section of the settings page in which to show the box (default, ...).
- * @param array $args Additional arguments
- */
-function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
-    global $wp_settings_fields;
-
-    if ( 'misc' == $page ) {
-        _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
-        $page = 'general';
-    }
-
-    if ( !isset($wp_settings_fields) )
-        $wp_settings_fields = array();
-    if ( !isset($wp_settings_fields[$page]) )
-        $wp_settings_fields[$page] = array();
-    if ( !isset($wp_settings_fields[$page][$section]) )
-        $wp_settings_fields[$page][$section] = array();
-
-    $wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
-}
-
-/**
- * Prints out all settings sections added to a particular settings page
- *
- * Part of the Settings API. Use this in a settings page callback function
- * to output all the sections and fields that were added to that $page with
- * add_settings_section() and add_settings_field()
- *
- * @global $wp_settings_sections Storage array of all settings sections added to admin pages
- * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections
- * @since 2.7.0
- *
- * @param string $page The slug name of the page whos settings sections you want to output
- */
-function do_settings_sections($page) {
-    global $wp_settings_sections, $wp_settings_fields;
-
-    if ( !isset($wp_settings_sections) || !isset($wp_settings_sections[$page]) )
-        return;
-
-    foreach ( (array) $wp_settings_sections[$page] as $section ) {
-        if ( $section['title'] )
-            echo "<h3>{$section['title']}</h3>\n";
-        call_user_func($section['callback'], $section);
-        if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']]) )
-            continue;
-        echo '<table class="form-table">';
-        do_settings_fields($page, $section['id']);
-        echo '</table>';
-    }
-}
-
-/**
- * Print out the settings fields for a particular settings section
- *
- * Part of the Settings API. Use this in a settings page to output
- * a specific section. Should normally be called by do_settings_sections()
- * rather than directly.
- *
- * @global $wp_settings_fields Storage array of settings fields and their pages/sections
- *
- * @since 2.7.0
- *
- * @param string $page Slug title of the admin page who's settings fields you want to show.
- * @param section $section Slug title of the settings section who's fields you want to show.
- */
-function do_settings_fields($page, $section) {
-    global $wp_settings_fields;
-
-    if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section]) )
-        return;
-
-    foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
-        echo '<tr valign="top">';
-        if ( !empty($field['args']['label_for']) )
-            echo '<th scope="row"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></th>';
-        else
-            echo '<th scope="row">' . $field['title'] . '</th>';
-        echo '<td>';
-        call_user_func($field['callback'], $field['args']);
-        echo '</td>';
-        echo '</tr>';
-    }
-}
-
-/**
- * Register a settings error to be displayed to the user
- *
- * Part of the Settings API. Use this to show messages to users about settings validation
- * problems, missing settings or anything else.
- *
- * Settings errors should be added inside the $sanitize_callback function defined in
- * register_setting() for a given setting to give feedback about the submission.
- *
- * By default messages will show immediately after the submission that generated the error.
- * Additional calls to settings_errors() can be used to show errors even when the settings
- * page is first accessed.
- *
- * @since 3.0.0
- *
- * @global array $wp_settings_errors Storage array of errors registered during this pageload
- *
- * @param string $setting Slug title of the setting to which this error applies
- * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
- * @param string $message The formatted message text to display to the user (will be shown inside styled <div> and <p>)
- * @param string $type The type of message it is, controls HTML class. Use 'error' or 'updated'.
- */
-function add_settings_error( $setting, $code, $message, $type = 'error' ) {
-    global $wp_settings_errors;
-
-    if ( !isset($wp_settings_errors) )
-        $wp_settings_errors = array();
-
-    $new_error = array(
-        'setting' => $setting,
-        'code' => $code,
-        'message' => $message,
-        'type' => $type
-    );
-    $wp_settings_errors[] = $new_error;
-}
-
-/**
- * Fetch settings errors registered by add_settings_error()
- *
- * Checks the $wp_settings_errors array for any errors declared during the current
- * pageload and returns them.
- *
- * If changes were just submitted ($_GET['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.
- *
- * Use the $sanitize argument to manually re-sanitize the option before returning errors.
- * This is useful if you have errors or notices you want to show even when the user
- * hasn't submitted data (i.e. when they first load an options page, or in admin_notices action hook)
- *
- * @since 3.0.0
- *
- * @global array $wp_settings_errors Storage array of errors registered during this pageload
- *
- * @param string $setting Optional slug title of a specific setting who's errors you want.
- * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
- * @return array Array of settings errors
- */
-function get_settings_errors( $setting = '', $sanitize = FALSE ) {
-    global $wp_settings_errors;
-
-    // If $sanitize is true, manually re-run the sanitizisation for this option
-    // This allows the $sanitize_callback from register_setting() to run, adding
-    // any settings errors you want to show by default.
-    if ( $sanitize )
-        sanitize_option( $setting, get_option($setting));
-
-    // If settings were passed back from options.php then use them
-    // Ignore transients if $sanitize is true, we don't want the old values anyway
-    if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
-        $settings_errors = get_transient('settings_errors');
-        delete_transient('settings_errors');
-    // Otherwise check global in case validation has been run on this pageload
-    } elseif ( count( $wp_settings_errors ) ) {
-        $settings_errors = $wp_settings_errors;
-    } else {
-        return;
-    }
-
-    // Filter the results to those of a specific setting if one was set
-    if ( $setting ) {
-        foreach ( (array) $settings_errors as $key => $details )
-            if ( $setting != $details['setting'] )
-                unset( $settings_errors[$key] );
-    }
-    return $settings_errors;
-}
-
-/**
- * Display settings errors registered by add_settings_error()
- *
- * Part of the Settings API. Outputs a <div> for each error retrieved by get_settings_errors().
- *
- * This is called automatically after a settings page based on the Settings API is submitted.
- * Errors should be added during the validation callback function for a setting defined in register_setting()
- *
- * The $sanitize option is passed into get_settings_errors() and will re-run the setting sanitization
- * on its current value.
- *
- * The $hide_on_update option will cause errors to only show when the settings page is first loaded.
- * if the user has already saved new values it will be hidden to avoid repeating messages already
- * shown in the default error reporting after submission. This is useful to show general errors like missing
- * settings when the user arrives at the settings page.
- *
- * @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.
- */
-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 );
-
-    if ( !is_array($settings_errors) ) return;
-
-    $output = '';
-    foreach ( $settings_errors as $key => $details ) {
-        $css_id = 'setting-error-' . $details['code'];
-        $css_class = $details['type'] . ' settings-error';
-        $output .= "<div id='$css_id' class='$css_class'> \n";
-        $output .= "<p><strong>{$details['message']}</strong></p>";
-        $output .= "</div> \n";
-    }
-    echo $output;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @param unknown_type $found_action
- */
-function find_posts_div($found_action = '') {
-?>
-    <div id="find-posts" class="find-box" style="display:none;">
-        <div id="find-posts-head" class="find-box-head"><?php _e('Find Posts or Pages'); ?></div>
-        <div class="find-box-inside">
-            <div class="find-box-search">
-                <?php if ( $found_action ) { ?>
-                    <input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
-                <?php } ?>
-
-                <input type="hidden" name="affected" id="affected" value="" />
-                <?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-                <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" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
-
-                <?php
-                $post_types = get_post_types( array('public' => true), 'objects' );
-                foreach ( $post_types as $post ) {
-                    if ( 'attachment' == $post->name )
-                        continue;
-                ?>
-                <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name,  'post'); ?> />
-                <label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
-                <?php
-                } ?>
-            </div>
-            <div id="find-posts-response"></div>
-        </div>
-        <div class="find-box-buttons">
-            <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>
-<?php
-}
-
-/**
- * Display the post password.
- *
- * The password is passed through {@link esc_attr()} to ensure that it
- * is safe for placing in an html attribute.
- *
- * @uses attr
- * @since 2.7.0
- */
-function the_post_password() {
-    global $post;
-    if ( isset( $post->post_password ) ) echo esc_attr( $post->post_password );
-}
-
-/**
  * {@internal Missing Short Description}}
  *
@@ -1507 +214 @@
     }
     echo "</div></div>\n";
-}
-
-/**
- * Get the post title.
- *
- * The post title is fetched and if it is blank then a default string is
- * returned.
- *
- * @since 2.7.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) )
-        $title = __('(no title)');
-    return $title;
-}
-
-/**
- * Display the search query.
- *
- * A simple wrapper to display the "s" parameter in a GET URI. This function
- * should only be used when {@link the_search_query()} cannot.
- *
- * @uses attr
- * @since 2.7.0
- *
- */
-function _admin_search_query() {
-    echo isset($_REQUEST['s']) ? esc_attr( stripslashes( $_REQUEST['s'] ) ) : '';
-}
-
-/**
- * Generic Iframe header for use with Thickbox
- *
- * @since 2.7.0
- * @param string $title Title of the Iframe page.
- * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued).
- *
- */
-function iframe_header( $title = '', $limit_styles = false ) {
-    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>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
-<?php
-wp_enqueue_style( 'colors' );
-?>
-<script type="text/javascript">
-//<![CDATA[
-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');
-?>
-</head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>  class="no-js <?php echo $admin_body_class; ?>">
-<script type="text/javascript">
-//<![CDATA[
-(function(){
-var c = document.body.className;
-c = c.replace(/no-js/, 'js');
-document.body.className = c;
-})();
-//]]>
-</script>
-<?php
-}
-
-/**
- * Generic Iframe footer for use with Thickbox
- *
- * @since 2.7.0
- *
- */
-function iframe_footer() {
-    //We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?>
-    <div class="hidden">
-<?php
-    do_action('admin_footer', '');
-    do_action('admin_print_footer_scripts'); ?>
-    </div>
-<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
-</body>
-</html>
-<?php
-}
-
-function _post_states($post) {
-    $post_states = array();
-    if ( isset($_GET['post_status']) )
-        $post_status = $_GET['post_status'];
-    else
-        $post_status = '';
-
-    if ( !empty($post->post_password) )
-        $post_states['protected'] = __('Password protected');
-    if ( 'private' == $post->post_status && 'private' != $post_status )
-        $post_states['private'] = __('Private');
-    if ( 'draft' == $post->post_status && 'draft' != $post_status )
-        $post_states['draft'] = __('Draft');
-    if ( 'pending' == $post->post_status && 'pending' != $post_status )
-        /* translators: post state */
-        $post_states['pending'] = _x('Pending', 'post state');
-    if ( is_sticky($post->ID) )
-        $post_states['sticky'] = __('Sticky');
-
-    $post_states = apply_filters( 'display_post_states', $post_states );
-
-    if ( ! empty($post_states) ) {
-        $state_count = count($post_states);
-        $i = 0;
-        echo ' - ';
-        foreach ( $post_states as $state ) {
-            ++$i;
-            ( $i == $state_count ) ? $sep = '' : $sep = ', ';
-            echo "<span class='post-state'>$state$sep</span>";
-        }
-    }
-
-    if ( get_post_format( $post->ID ) )
-        echo ' - <span class="post-state-format">' . get_post_format_string( get_post_format( $post->ID ) ) . '</span>';
-}
-
-function _media_states( $post ) {
-    $media_states = array();
-    $stylesheet = get_option('stylesheet');
-
-    if ( current_theme_supports( 'custom-header') ) {
-        $meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
-        if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
-            $media_states[] = __( 'Header Image' );
-    }
-
-    if ( current_theme_supports( 'custom-background') ) {
-        $meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
-        if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
-            $media_states[] = __( 'Background Image' );
-    }
-
-    $media_states = apply_filters( 'display_media_states', $media_states );
-
-    if ( ! empty( $media_states ) ) {
-        $state_count = count( $media_states );
-        $i = 0;
-        echo ' - ';
-        foreach ( $media_states as $state ) {
-            ++$i;
-            ( $i == $state_count ) ? $sep = '' : $sep = ', ';
-            echo "<span class='post-state'>$state$sep</span>";
-        }
-    }
 }
 
@@ -2037 +565 @@
 
 /**
- * Test support for compressing JavaScript from PHP
- *
- * Outputs JavaScript that tests if compression from PHP works as expected
- * and sets an option with the result. Has no effect when the current user
- * is not an administrator. To run the test again the option 'can_compress_scripts'
- * has to be deleted.
- *
- * @since 2.8.0
- */
-function compression_test() {
-?>
-    <script type="text/javascript">
-    /* <![CDATA[ */
-    var testCompression = {
-        get : function(test) {
-            var x;
-            if ( window.XMLHttpRequest ) {
-                x = new XMLHttpRequest();
-            } else {
-                try{x=new ActiveXObject('Msxml2.XMLHTTP');}catch(e){try{x=new ActiveXObject('Microsoft.XMLHTTP');}catch(e){};}
-            }
-
-            if (x) {
-                x.onreadystatechange = function() {
-                    var r, h;
-                    if ( x.readyState == 4 ) {
-                        r = x.responseText.substr(0, 18);
-                        h = x.getResponseHeader('Content-Encoding');
-                        testCompression.check(r, h, test);
-                    }
-                }
-
-                x.open('GET', ajaxurl + '?action=wp-compression-test&test='+test+'&'+(new Date()).getTime(), true);
-                x.send('');
-            }
-        },
-
-        check : function(r, h, test) {
-            if ( ! r && ! test )
-                this.get(1);
-
-            if ( 1 == test ) {
-                if ( h && ( h.match(/deflate/i) || h.match(/gzip/i) ) )
-                    this.get('no');
-                else
-                    this.get(2);
-
-                return;
-            }
-
-            if ( 2 == test ) {
-                if ( '"wpCompressionTest' == r )
-                    this.get('yes');
-                else
-                    this.get('no');
-            }
-        }
-    };
-    testCompression.check();
-    /* ]]> */
-    </script>
-<?php
-}
-
-/**
  *  Get the current screen object
  *
@@ -2132 +595 @@
 
     $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 output 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 output 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;
-}
-
-/**
- * Initializes the new feature pointers.
- *
- * @since 3.3.0
- *
- * Pointer user settings:
- *    p0 - Admin bar pointer, added 3.3.
- */
-function wp_pointer_enqueue( $hook_suffix ) {
-    $enqueue = false;
-
-    $admin_bar = get_user_setting( 'p0', 0 );
-    if ( ! $admin_bar && apply_filters( 'show_wp_pointer_admin_bar', true ) ) {
-        $enqueue = true;
-        add_action( 'admin_print_footer_scripts', '_wp_pointer_print_admin_bar' );
-    }
-
-    if ( $enqueue ) {
-        wp_enqueue_style( 'wp-pointer' );
-        wp_enqueue_script( 'wp-pointer' );
-        wp_enqueue_script( 'utils' );
-    }
-}
-add_action( 'admin_enqueue_scripts', 'wp_pointer_enqueue' );
-
-function _wp_pointer_print_admin_bar() {
-    $pointer_content  = '<h3>' . ('The admin bar has been updated in WordPress 3.3.') . '</h3>';
-    $pointer_content .= '<p>' . sprintf( ('Have some feedback? Visit this <a href="%s">ticket</a>.'), 'http://core.trac.wordpress.org/ticket/18197' ) . '</p>';
-    $pointer_content .= '<p>' . sprintf( ('P.S. You are looking at a new admin pointer. Chime in <a href="%s">here</a>.'), 'http://core.trac.wordpress.org/ticket/18693' ) . '</p>';
-
-?>
-<script type="text/javascript">
-//<![CDATA[
-jQuery(document).ready( function($) {
-    $('#wpadminbar').pointer({
-        content: '<?php echo $pointer_content; ?>',
-        position: {
-            my: 'left top',
-            at: 'center bottom',
-            offset: '-25 0'
-        },
-        close: function() {
-            setUserSetting( 'p0', '1' );
-        }
-    }).pointer('open');
-});
-//]]>
-</script>
-<?php
 }
 

trunk/wp-admin/includes/template.php

@@ -220 +220 @@
         echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
     }
-}
-
-/**
- * Get the column headers for a screen
- *
- * @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 ) {
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
-
-    global $_wp_column_headers;
-
-    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' );
 }
 
@@ -1007 +971 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @param unknown_type $screen
- */
-function meta_box_prefs($screen) {
-    global $wp_meta_boxes;
-
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    if ( empty($wp_meta_boxes[$screen->id]) )
-        return;
-
-    $hidden = get_hidden_meta_boxes($screen);
-
-    foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) {
-        foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) {
-            foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) {
-                if ( false == $box || ! $box['title'] )
-                    continue;
-                // Submit box cannot be hidden
-                if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
-                    continue;
-                $box_id = $box['id'];
-                echo '<label for="' . $box_id . '-hide">';
-                echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
-                echo "{$box['title']}</label>\n";
-            }
-        }
-    }
-}
-
-/**
- * Get Hidden Meta Boxes
- *
- * @since 2.7.0
- *
- * @param string|object $screen Screen identifier
- * @return array Hidden Meta Boxes
- */
-function get_hidden_meta_boxes( $screen ) {
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
-
-    $hidden = get_user_option( "metaboxhidden_{$screen->id}" );
-
-    // Hide slug boxes by default
-    if ( !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;
-}
-
-/**
  * Add a new section to a settings page.
  *
@@ -1395 +1298 @@
     global $post;
     if ( isset( $post->post_password ) ) echo esc_attr( $post->post_password );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- */
-function favorite_actions( $screen = null ) {
-    $default_action = false;
-
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    if ( $screen->is_user )
-        return;
-
-    if ( isset($screen->post_type) ) {
-        $post_type_object = get_post_type_object($screen->post_type);
-        if ( 'add' != $screen->action )
-            $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
-        else
-            $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->name, $post_type_object->cap->edit_posts));
-    }
-
-    if ( !$default_action ) {
-        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;
-            }
-        }
-    }
-
-    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);
-    $default_key = $default_key[0];
-    if ( isset($actions[$default_key]) )
-        unset($actions[$default_key]);
-    $actions = array_merge($default_action, $actions);
-    $actions = apply_filters( 'favorite_actions', $actions, $screen );
-
-    $allowed_actions = array();
-    foreach ( $actions as $action => $data ) {
-        if ( current_user_can($data[1]) )
-            $allowed_actions[$action] = $data[0];
-    }
-
-    if ( empty($allowed_actions) )
-        return;
-
-    $first = array_keys($allowed_actions);
-    $first = $first[0];
-    echo '<div id="favorite-actions">';
-    echo '<div id="favorite-first"><a href="' . $first . '">' . $allowed_actions[$first] . '</a></div><div id="favorite-toggle"><br /></div>';
-    echo '<div id="favorite-inside">';
-
-    array_shift($allowed_actions);
-
-    foreach ( $allowed_actions as $action => $label) {
-        echo "<div class='favorite-action'><a href='$action'>";
-        echo $label;
-        echo "</a></div>\n";
-    }
-    echo "</div></div>\n";
 }
 
@@ -1689 +1480 @@
 
 /**
- * Convert a screen string to a screen object
- *
- * @since 3.0.0
- *
- * @param string $screen The name of the screen
- * @return object An object containing the safe screen name and id
- */
-function convert_to_screen( $screen ) {
-    $screen = str_replace( array('.php', '-new', '-add', '-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);
-    return $screen;
-}
-
-function screen_meta($screen) {
-    global $wp_meta_boxes, $_wp_contextual_help, $wp_list_table, $wp_current_screen_options;
-
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    $columns = get_column_headers( $screen );
-    $hidden = get_hidden_columns( $screen );
-
-    $meta_screens = array('index' => 'dashboard');
-
-    if ( isset($meta_screens[$screen->id]) ) {
-        $screen->id = $meta_screens[$screen->id];
-        $screen->base = $screen->id;
-    }
-
-    $show_screen = false;
-    if ( !empty($wp_meta_boxes[$screen->id]) || !empty($columns) )
-        $show_screen = true;
-
-    $screen_options = screen_options($screen);
-    if ( $screen_options )
-        $show_screen = true;
-
-    if ( !isset($_wp_contextual_help) )
-        $_wp_contextual_help = array();
-
-    $settings = apply_filters('screen_settings', '', $screen);
-
-    switch ( $screen->id ) {
-        case 'widgets':
-            $settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
-            $show_screen = true;
-            break;
-    }
-    if ( ! empty( $settings ) )
-        $show_screen = true;
-
-    if ( !empty($wp_current_screen_options) )
-        $show_screen = true;
-
-    $show_screen = apply_filters('screen_options_show_screen', $show_screen, $screen);
-
-    // If we have screen options, add the menu to the admin bar.
-    if ( $show_screen )
-        add_action( 'admin_bar_menu', 'wp_admin_bar_screen_options_menu', 80 );
-
-
-?>
-<div id="screen-meta">
-<?php if ( $show_screen ) : ?>
-<div id="screen-options-wrap" class="hidden">
-    <form id="adv-settings" action="" method="post">
-    <?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?>
-        <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
-        <div class="metabox-prefs">
-            <?php meta_box_prefs($screen); ?>
-            <br class="clear" />
-        </div>
-        <?php endif;
-        if ( ! empty($columns) ) : ?>
-        <h5><?php echo ( isset( $columns['_title'] ) ?  $columns['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
-        <div class="metabox-prefs">
-<?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>
-    <?php endif;
-    echo screen_layout($screen);
-
-    if ( !empty( $screen_options ) ) {
-        ?>
-        <h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
-        <?php
-    }
-
-    echo $screen_options;
-    echo $settings; ?>
-    <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
-    </form>
-</div>
-
-<?php endif; // $show_screen
-
-    $_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen);
-    ?>
-    <div id="contextual-help-wrap" class="hidden">
-    <?php
-    $contextual_help = '';
-    if ( isset($_wp_contextual_help[$screen->id]) && is_array($_wp_contextual_help[$screen->id]) ) {
-        $contextual_help .= '<div class="metabox-prefs">' . "\n";
-
-        /*
-         * Loop through ['contextual-help-tabs']
-         *   - It's a nested array where $key=>$value >> $title=>$content
-         * Has no output so can only loop the array once
-         */
-        $contextual_help_tabs = ''; // store looped content for later
-        $contextual_help_panels = ''; // store looped content for later
-
-        $tab_active = true;
-
-        foreach ( $_wp_contextual_help[$screen->id]['tabs'] as $tab ) {
-            $tab_slug = sanitize_html_class( $tab[ 0 ] );
-            $contextual_help_tabs .= '<li class="tab-' . $tab_slug . ( ($tab_active) ? ' active' : '' ) . '">';
-            $contextual_help_tabs .= '<a href="#' . $tab_slug . '">' . $tab[1] . '</a>';
-            $contextual_help_tabs .= '</li>' ."\n";
-            
-            $contextual_help_panels .= '<div id="' . $tab_slug . '" class="help-tab-content' . ( ($tab_active) ? ' active' : '' ) . '">';
-            $contextual_help_panels .= $tab[2];
-            $contextual_help_panels .= "</div>\n";
-
-            $tab_active = false;
-        }
-
-        // Start output from loop: Tabbed help content
-        $contextual_help .= '<ul class="contextual-help-tabs">' . "\n";
-        $contextual_help .= $contextual_help_tabs;
-        $contextual_help .= '</ul>' ."\n";
-        $contextual_help .= '<div class="contextual-help-tabs-wrap">' . "\n";
-        $contextual_help .= $contextual_help_panels;
-        $contextual_help .= "</div>\n";
-        // END: Tabbed help content
-
-        // Sidebar to right of tabs
-        $contextual_help .= '<div class="contextual-help-links">' . "\n";
-        $contextual_help .= $_wp_contextual_help[$screen->id]['sidebar'];
-        $contextual_help .= "</div>\n";
-        
-        $contextual_help .= "</div>\n"; // end metabox
-        
-    } elseif ( isset($_wp_contextual_help[$screen->id]) ) {
-        $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen->id] . "</div>\n";
-    } else {
-        $contextual_help .= '<div class="metabox-prefs">';
-        $default_help  = __('<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>');
-        $default_help .= '<br />';
-        $default_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>');
-        $contextual_help .= apply_filters('default_contextual_help', $default_help);
-        $contextual_help .= '</div>' . "\n";
-    }
-
-    echo apply_filters('contextual_help', $contextual_help, $screen->id, $screen);
-    ?>
-    </div>
-
-</div> <?php // #screen-meta
-}
-
-/**
- * Add contextual help text for a page
- *
- * The array $help takes the following format:
- *  array( 'contextual-help-tabs'   => array( $tab1_title => $tab1_value [, $tab2_title => $tab2_value, ...] ),
- *      'contextual-help-links' => $help_links_as_string )
- *
- * For backwards compatability, a string is also accepted.
- *
- * @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|string  $help   Creates tabs & links columns within help text in array.
- *
- */
-function add_contextual_help($screen, $help) {
-    global $_wp_contextual_help;
-
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    if ( !isset($_wp_contextual_help) )
-        $_wp_contextual_help = array();
-
-    $_wp_contextual_help[$screen->id] = $help;
-}
-
-function screen_layout($screen) {
-    global $screen_layout_columns, $wp_current_screen_options;
-
-    if ( is_string($screen) )
-        $screen = convert_to_screen($screen);
-
-    // 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 = $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 = 'auto';
-    }
-
-    $i = 1;
-    $return = '<h5>' . __('Screen Layout') . "</h5>\n<div class='columns-prefs'>" . __('Number of Columns:') . "\n";
-    while ( $i <= $num ) {
-        $return .= "<label><input type='radio' name='screen_columns' value='$i'" . ( ($screen_layout_columns == $i) ? " checked='checked'" : "" ) . " /> $i</label>\n";
-        ++$i;
-    }
-    $return .= "<label><input type='radio' id='wp_auto_columns' name='screen_columns' value='auto'" . ( ($screen_layout_columns == 'auto') ? " checked='checked'" : "" ) . " />" . __('auto') . "</label>\n";
-    $return .= "</div>\n";
-    return $return;
-}
-
-/**
- * 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);
-
-    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 ( isset($wp_current_screen_options['per_page']['default']) )
-            $per_page = $wp_current_screen_options['per_page']['default'];
-        else
-            $per_page = 20;
-    }
-
-    if ( 'edit_comments_per_page' == $option )
-        $per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
-    elseif ( 'categories_per_page' == $option )
-        $per_page = apply_filters( 'edit_categories_per_page', $per_page );
-    else
-        $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 .= 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";
-    return $return;
-}
-
-function screen_icon( $screen = '' ) {
-    echo get_screen_icon( $screen );
-}
-
-function get_screen_icon( $screen = '' ) {
-    global $current_screen, $typenow;
-
-    if ( empty($screen) )
-        $screen = $current_screen;
-    elseif ( is_string($screen) )
-        $name = $screen;
-
-    $class = 'icon32';
-
-    if ( empty($name) ) {
-        if ( !empty($screen->parent_base) )
-            $name = $screen->parent_base;
-        else
-            $name = $screen->base;
-
-        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 );
-    }
-
-    return '<div id="icon-' . esc_attr( $name ) . '" class="' . $class . '"><br /></div>';
-}
-
-/**
  * Test support for compressing JavaScript from PHP
  *
@@ -2099 +1542 @@
     </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;
-}
-
-/**
- * Set the current screen object
- *
- * @since 3.0.0
- *
- * @uses $current_screen
- *
- * @param string $id Screen id, optional.
- */
-function set_current_screen( $id =  '' ) {
-    global $current_screen;
-
-    $current_screen = new WP_Screen( $id );
-
-    $current_screen = apply_filters('current_screen', $current_screen);
 }
 
@@ -2262 +1672 @@
 <?php
 }
-
-class WP_Screen {
-    var $action = '';
-    var $base;
-    var $id;
-    var $is_network;
-    var $is_user;
-    var $parent_base;
-    var $parent_file;
-    var $post_type;
-    var $taxonomy;
-
-    function __construct( $id = '' ) {
-        global $hook_suffix, $typenow, $taxnow;
-
-        $action = '';
-
-        if ( empty( $id ) ) {
-            $screen = $hook_suffix;
-            $screen = str_replace('.php', '', $screen);
-            if ( preg_match('/-add|-new$/', $screen) )
-                $action = 'add';
-            $screen = str_replace('-new', '', $screen);
-            $screen = str_replace('-add', '', $screen);
-            $this->id = $this->base = $screen;
-        } else {
-            $id = sanitize_key( $id );
-            if ( false !== strpos($id, '-') ) {
-                list( $id, $typenow ) = explode('-', $id, 2);
-                if ( taxonomy_exists( $typenow ) ) {
-                    $id = 'edit-tags';
-                    $taxnow = $typenow;
-                    $typenow = '';
-                }
-            }
-            $this->id = $this->base = $id;
-        }
-
-        $this->action = $action;
-
-        // Map index to dashboard
-        if ( 'index' == $this->base )
-            $this->base = 'dashboard';
-        if ( 'index' == $this->id )
-            $this->id = 'dashboard';
-
-        if ( 'edit' == $this->id ) {
-            if ( empty($typenow) )
-                $typenow = 'post';
-            $this->id .= '-' . $typenow;
-            $this->post_type = $typenow;
-        } elseif ( 'post' == $this->id ) {
-            if ( empty($typenow) )
-                $typenow = 'post';
-            $this->id = $typenow;
-            $this->post_type = $typenow;
-        } elseif ( 'edit-tags' == $this->id ) {
-            if ( empty($taxnow) )
-                $taxnow = 'post_tag';
-            $this->id = 'edit-' . $taxnow;
-            $this->taxonomy = $taxnow;
-        }
-
-        $this->is_network = is_network_admin();
-        $this->is_user = is_user_admin();
-
-        if ( $this->is_network ) {
-            $this->base .= '-network';
-            $this->id .= '-network';
-        } elseif ( $this->is_user ) {
-            $this->base .= '-user';
-            $this->id .= '-user';
-        }
-    }
-
-    function set_parentage( $parent_file ) {
-        $this->parent_file = $parent_file;
-        $this->parent_base = preg_replace('/\?.*$/', '', $parent_file);
-        $this->parent_base = str_replace('.php', '', $this->parent_base);
-    }
-
-    function add_option( $option, $args = array() ) {
-        return add_screen_option( $option, $args );
-    }
-
-    function add_help_tab( $id, $title, $content) {
-        global $_wp_contextual_help;
-
-        $_wp_contextual_help[$this->id]['tabs'][] = array( $id, $title, $content );
-    }
-
-    function add_help_sidebar( $content ) {
-        global $_wp_contextual_help;
-
-        $_wp_contextual_help[$this->id]['sidebar'] = $content;
-    }
-}