vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-09 11:40:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [18861], [18862], [18864], [18874], [18879], and [18880]. see #18785.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18911 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2011-10-07 04:57:12 +00:00
parent d9f0fec29c
commit 2efff75050
22 changed files with 447 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

555
wp-admin/includes/screen.php
View File

@@ -14,7 +14,7 @@
* @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 ) { // TODO: fold into WP_Screen?
function get_column_headers( $screen ) {
if ( is_string( $screen ) )
$screen = convert_to_screen( $screen );
@@ -35,13 +35,48 @@ function get_column_headers( $screen ) { // TODO: fold into WP_Screen?
* @param string|object $screen The screen you want the hidden columns for
* @return array
*/
function get_hidden_columns( $screen ) { // TODO: fold into WP_Screen
function get_hidden_columns( $screen ) {
if ( is_string( $screen ) )
$screen = convert_to_screen( $screen );
return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
}
/**
* {@internal Missing Short Description}}
*
* @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
*
@@ -50,7 +85,7 @@ function get_hidden_columns( $screen ) { // TODO: fold into WP_Screen
* @param string|object $screen Screen identifier
* @return array Hidden Meta Boxes
*/
function get_hidden_meta_boxes( $screen ) { // TODO: fold into WP_Screen
function get_hidden_meta_boxes( $screen ) {
if ( is_string( $screen ) )
$screen = convert_to_screen( $screen );
@@ -62,13 +97,124 @@ function get_hidden_meta_boxes( $screen ) { // TODO: fold into WP_Screen
$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;
}
/**
* {@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";
}
/**
* Convert a screen string to a screen object
*
@@ -77,7 +223,7 @@ function get_hidden_meta_boxes( $screen ) { // TODO: fold into WP_Screen
* @param string $screen The name of the screen
* @return object An object containing the safe screen name and id
*/
function convert_to_screen( $screen ) { // TODO: fold into WP_Screen?
function convert_to_screen( $screen ) {
$screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
if ( is_network_admin() )
@@ -85,18 +231,86 @@ function convert_to_screen( $screen ) { // TODO: fold into WP_Screen?
elseif ( is_user_admin() )
$screen .= '-user';
// why do we need this? $screen = (string) apply_filters( 'screen_meta_screen', $screen );
$screen = (string) apply_filters( 'screen_meta_screen', $screen );
$screen = (object) array('id' => $screen, 'base' => $screen);
return $screen;
}
function screen_icon( $for = '' ) { // TODO: fold into WP_Screen?
global $current_screen;
/**
* Add contextual help text for a page.
*
* Creates a 'Screen Info' help tab.
*
* @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 string $help The content of a 'Screen Info' help tab.
*
* @todo: deprecate?
*/
function add_contextual_help($screen, $help) {
global $_wp_contextual_help;
if ( !isset($current_screen) )
if ( is_string($screen) )
$screen = convert_to_screen($screen);
if ( !isset($_wp_contextual_help) )
$_wp_contextual_help = array();
$_wp_contextual_help[$screen->id] = $help;
}
/**
* 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() ) {
$current_screen = get_current_screen();
if ( ! $current_screen )
return;
echo $current_screen->get_screen_icon( $for );
return $current_screen->add_option( $option, $args );
}
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>';
}
/**
@@ -124,13 +338,12 @@ function get_current_screen() {
*
* @param string $id Screen id, optional.
*/
function set_current_screen( $id = '' ) {
function set_current_screen( $id = '' ) {
global $current_screen;
if ( !is_a( $current_screen, 'WP_Screen' ) )
$current_screen = new WP_Screen( $id );
$current_screen = new WP_Screen( $id );
// why do we need this? $current_screen = apply_filters('current_screen', $current_screen);
$current_screen = apply_filters('current_screen', $current_screen);
}
/**
@@ -251,19 +464,26 @@ final class WP_Screen {
* @var array
* @access private
*/
private $_options = array(
'_context' => '',
'_screen_settings' => ''
);
private $_options = array();
/**
* Show screen options if any.
* Stores the result of the public show_screen_options function.
*
* @since 3.3.0
* @var bool
* @access private
*/
private $_show_options = false;
private $_show_screen_options;
/**
* Stores the 'screen_settings' section of screen options.
*
* @since 3.3.0
* @var string
* @access private
*/
private $_screen_settings;
/**
* Constructor
@@ -280,19 +500,15 @@ final class WP_Screen {
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;
@@ -307,26 +523,22 @@ final class WP_Screen {
// 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;
}
@@ -359,47 +571,26 @@ final class WP_Screen {
/**
* Adds an option for the screen.
* Use the 'add_screen_help_and_options' action to add screen options.
* Call this in template files after admin.php is loaded and before admin-header.php is loaded to add screen options.
*
* @since 3.3.0
*
* @param string $option Option ID
* @param mixed $args Associative array of arguments particular to the default $option or the HTML string to be printed in the Screen Options tab.
* @param array $args Associative array of arguments particular to the given $option.
*/
public function add_option( $option, $args = null ) {
if ( is_array($args) && !empty($option) )
$this->_options[ $option ] = $args;
elseif ( is_string($option) )
$this->_options['_screen_settings'] .= $option;
else
return false;
$this->_show_options = true;
return true;
}
/**
* Adds option context.
* Use the 'add_screen_help_and_options' action to add it. Will not be shown if there aren't any screen options.
*
* @since 3.3.0
*
* @param string $text
*/
public function add_option_context( $text ) {
$this->_options['_context'] .= $text;
public function add_option( $option, $args = array() ) {
$this->_options[ $option ] = $args;
}
/**
* Add a help tab to the contextual help for the screen.
* Use the 'add_screen_help_and_options' action to add contextual help tabs.
* Call this in template files after admin.php is loaded and before admin-header.php is loaded to add contextual help tabs.
*
* @since 3.3.0
*
* @param array $args
* - string - title - Title for the tab.
* - string - id - Tab ID.
* - string - section - Section title for the tab. Optional.
* - string - id - Tab ID. Optional.
* - string - content - Help tab content in plain text or HTML. Optional.
* - callback - callback - A callback to generate the tab content. Optional.
*
@@ -408,31 +599,32 @@ final class WP_Screen {
$defaults = array(
'title' => false,
'id' => false,
'section' => false,
'content' => '',
'callback' => false
'callback' => false,
);
$args = wp_parse_args( $args, $defaults );
// Ensure we have title and ID.
if ( ! $args['title'] || ! $args['id'] )
return false;
// Ensure we have a title.
if ( ! $args['title'] )
return;
// Create an id from the title if one is not provided.
if ( ! $args['id'] )
$args['id'] = sanitize_html_class( $args['title'] );
$this->_help_tabs[] = $args;
return true;
}
/**
* Add a sidebar to the contextual help for the screen.
* Use the 'add_screen_help_and_options' action to add a sidebar to the contextual help.
* Call this in template files after admin.php is loaded and before admin-header.php is loaded to add a sidebar to the contextual help.
*
* @since 3.3.0
*
* @param string $content Sidebar content in plain text or HTML.
*/
public function add_help_sidebar( $content ) {
if ( empty($this->_help_sidebar) ) // add only one
$this->_help_sidebar = $content;
$this->_help_sidebar = $content;
}
/**
@@ -445,24 +637,26 @@ final class WP_Screen {
public function render_screen_meta() {
global $_wp_contextual_help;
// Intended for adding Help and Screen Options.
do_action('add_screen_help_and_options', $this);
// Call old contextual_help_list filter.
if ( ! isset( $_wp_contextual_help ) )
$_wp_contextual_help = array();
// why are we filtering a global? $_wp_contextual_help = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
$_wp_contextual_help = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
if ( isset( $_wp_contextual_help[ $this->id ] ) ) {
// Call old contextual_help filter.
// why are we filtering the same global second time??
$contextual_help = apply_filters( 'contextual_help', $_wp_contextual_help[ $this->id ], $this->id, $this );
$this->add_help_tab( array(
'title' => __('Screen Info'),
'id' => 'screen-info',
'content' => $_wp_contextual_help[ $this->id ]
'title' => __('Screen Info'),
'content' => $contextual_help,
) );
}
// Add screen options tab
if ( $this->show_screen_options() ) {
$this->add_help_tab( array(
'title' => __('Screen Options'),
'callback' => array( $this, 'render_screen_options' ),
) );
}
@@ -473,60 +667,35 @@ final class WP_Screen {
<div id="contextual-help-wrap" class="hidden">
<div class="contextual-help-tabs">
<ul>
<?php
if ( $this->_show_options ) {
$class = true;
<?php foreach ( $this->_help_tabs as $i => $tab ):
$link_id = "tab-link-{$tab['id']}";
$panel_id = "tab-panel-{$tab['id']}";
$classes = ( $i == 0 ) ? 'active' : '';
?>
<li id="tab-link-screen-options" class="active">
<a href="#tab-panel-screen-options">
<?php _e('Screen Options'); ?>
</a>
</li>
<?php
}
foreach ( $this->_help_tabs as $i => $tab ) {
$id = esc_attr($tab['id']);
$class = empty($class) && $i == 0 ? ' class="active"' : '';
?>
<li id="<?php echo "tab-link-$id"; ?>"<?php echo $class; ?>>
<a href="<?php echo "#tab-panel-$id"; ?>">
<li id="<?php echo esc_attr( $link_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
<a href="<?php echo esc_url( "#$panel_id" ); ?>">
<?php echo esc_html( $tab['title'] ); ?>
</a>
</li>
<?php } ?>
<?php endforeach; ?>
</ul>
</div>
<?php
if ( $this->_help_sidebar )
echo '<div class="contextual-help-sidebar">' . $this->_help_sidebar . '</div>';
<div class="contextual-help-sidebar">
<?php echo $this->_help_sidebar; ?>
</div>
?>
<div class="contextual-help-tabs-wrap">
<?php
if ( $this->_show_options ) {
$class2 = true;
echo '<div id="tab-panel-screen-options" class="help-tab-content active">';
if ( !empty($this->_options['_context']) )
echo $this->_options['_context'];
$this->render_screen_options();
echo '</div>';
}
foreach ( $this->_help_tabs as $i => $tab ) {
$class2 = empty($class2) && $i == 0 ? ' active' : '';
<?php foreach ( $this->_help_tabs as $i => $tab ):
$panel_id = "tab-panel-{$tab['id']}";
$classes = ( $i == 0 ) ? 'active' : '';
$classes .= ' help-tab-content';
?>
<div id="<?php echo esc_attr( "tab-panel-{$tab['id']}" ); ?>" class="help-tab-content<?php echo $class2; ?>">
<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
<h3><?php echo esc_html( $tab['title'] ); ?></h3>
<?php
if ( $tab['section'] )
echo '<h3>' . esc_html( $tab['section'] ) . '</h3>';
// Print tab content.
echo $tab['content'];
@@ -535,57 +704,68 @@ final class WP_Screen {
call_user_func( $tab['callback'], $this );
?>
</div>
<?php } ?>
<?php endforeach; ?>
</div>
</div>
</div>
<?php
}
public function show_screen_options() {
global $wp_meta_boxes, $wp_list_table;
if ( is_bool( $this->_show_screen_options ) )
return $this->_show_screen_options;
$columns = get_column_headers( $this );
$show_screen = false;
if ( ! empty( $wp_meta_boxes[ $this->id ] ) || ! empty( $columns ) )
$show_screen = true;
// Check if there are per-page options.
$show_screen = $show_screen || isset( $this->_options['per_page'] );
$this->_screen_settings = apply_filters( 'screen_settings', '', $this );
switch ( $this->id ) {
case 'widgets':
$this->_screen_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( $this->_screen_settings ) )
$show_screen = true;
if ( ! empty( $this->_options ) )
$show_screen = true;
$this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
return $this->_show_screen_options;
}
/**
* Render the screen options tab.
*
* @since 3.3.0
*/
public function render_screen_options() {
global $wp_meta_boxes, $wp_list_table;
$screen_settings = $this->_options['_screen_settings'];
// Default screen_settings for various screens.
// TODO: should probably be set on these screens, not here.
switch ( $this->id ) {
case 'widgets':
$screen_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";
break;
}
// TODO: deprecate
$screen_settings = apply_filters( 'screen_settings', $screen_settings, $this );
echo '<form id="adv-settings" action="" method="post">';
$this->render_table_columns_prefs();
$this->render_metabox_prefs();
$this->render_screen_layout();
$this->render_per_page_options();
echo $screen_settings;
wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false );
echo '</form>';
}
/**
* Render the option for hiding table columns on the page
*
* @since 3.3.0
*/
function render_table_columns_prefs() {
$columns = get_column_headers( $this );
$hidden = get_hidden_columns( $this );
if ( ! empty( $columns ) ) {
$hidden = get_hidden_columns( $this );
?>
?>
<form id="adv-settings" action="" method="post">
<?php if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
<h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
<div class="metabox-prefs">
<?php meta_box_prefs( $this ); ?>
<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
@@ -600,7 +780,6 @@ final class WP_Screen {
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 ) . ' />';
@@ -609,45 +788,16 @@ final class WP_Screen {
?>
<br class="clear" />
</div>
<?php }
}
<?php endif;
/**
* Render the option for hiding metaboxes on the page
*
* @since 3.3.0
*/
function render_metabox_prefs() {
global $wp_meta_boxes;
$this->render_screen_layout();
$this->render_per_page_options();
echo $this->_screen_settings;
if ( !empty( $wp_meta_boxes[ $this->id ] ) ) {
$hidden = get_hidden_meta_boxes($this);
?>
<h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
<div class="metabox-prefs">
<?php
foreach ( array_keys($wp_meta_boxes[$this->id]) as $context ) {
foreach ( array_keys($wp_meta_boxes[$this->id][$context]) as $priority ) {
foreach ( $wp_meta_boxes[$this->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";
}
}
}
?>
<br class="clear" />
</div>
<?php
}
?>
<div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
</form>
<?php
}
/**
@@ -659,11 +809,10 @@ final class WP_Screen {
global $screen_layout_columns;
// Back compat for plugins using the filter instead of add_screen_option()
// TODO: deprecate it
$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
add_screen_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
if ( ! isset( $this->_options['layout_columns'] ) ) {
$screen_layout_columns = 0;
@@ -701,7 +850,7 @@ final class WP_Screen {
* @since 3.3.0
*/
function render_per_page_options() {
if ( empty( $this->_options['per_page'] ) )
if ( ! isset( $this->_options['per_page'] ) )
return;
$per_page_label = $this->_options['per_page']['label'];
@@ -750,26 +899,4 @@ final class WP_Screen {
</div>
<?php
}
function get_screen_icon( $for = '' ) {
if ( !empty($for) && is_string($for) ) {
$name = $for;
} else {
if ( !empty($this->parent_base) )
$name = $this->parent_base;
else
$name = $this->base;
}
if ( 'edit' == $name && isset($this->post_type) && 'page' == $this->post_type )
$name = 'edit-pages';
$class = '';
if ( !empty( $this->post_type ) )
$class = ' ' . sanitize_html_class( 'icon32-posts-' . $this->post_type );
return '<div id="icon-' . esc_attr( $name ) . '" class="icon32' . $class . '"><br /></div>';
}
}
}