Ticket #20506: 20506.5.diff
File 20506.5.diff, 5.1 KB (added by , 12 years ago) |
---|
-
wp-admin/includes/dashboard.php
193 193 * @since 2.5.0 194 194 */ 195 195 function wp_dashboard() { 196 global $screen_layout_columns;197 198 196 $screen = get_current_screen(); 199 $class = 'columns-' . $screen_layout_columns;197 $class = 'columns-' . get_current_screen()->get_columns(); 200 198 201 199 ?> 202 200 <div id="dashboard-widgets" class="metabox-holder <?php echo $class; ?>"> -
wp-admin/includes/screen.php
226 226 public $base; 227 227 228 228 /** 229 * The number of columns to display. Access with get_columns(). 230 * 231 * @since 3.4.0 232 * @var int 233 * @access private 234 */ 235 private $columns = 0; 236 237 /** 229 238 * The unique ID of the screen. 230 239 * 231 240 * @since 3.3.0 … … 665 674 public function get_help_sidebar() { 666 675 return $this->_help_sidebar; 667 676 } 668 677 669 678 /** 670 679 * Add a sidebar to the contextual help for the screen. 671 680 * 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. … … 679 688 } 680 689 681 690 /** 691 * Gets the number of layout columns the user has selected. 692 * 693 * The layout_columns option controls the max number and default number of 694 * columns. This method returns the number of columns within that range selected 695 * by the user via Screen Options. If no selection has been made, the default 696 * provisioned in layout_columns is returned. If the screen does not support 697 * selecting the number of layout columns, 0 is returned. 698 * 699 * @since 3.4.0 700 * 701 * @return int Number of columns to display. 702 */ 703 public function get_columns() { 704 return $this->columns; 705 } 706 707 /** 682 708 * Render the screen's help section. 683 709 * 684 710 * This will trigger the deprecated filters for backwards compatibility. … … 773 799 </div> 774 800 </div> 775 801 <?php 802 // Setup layout columns 803 804 // Back compat for plugins using the filter instead of add_screen_option() 805 $columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this ); 806 807 if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) 808 $this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) ); 809 810 if ( $this->get_option( 'layout_columns' ) ) { 811 $this->columns = (int) get_user_option("screen_layout_$this->id"); 812 813 if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) 814 $this->columns = $this->get_option( 'layout_columns', 'default' ); 815 } 816 $GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the gobal for back-compat. 817 776 818 // Add screen options 777 819 if ( $this->show_screen_options() ) 778 820 $this->render_screen_options(); … … 907 949 * @since 3.3.0 908 950 */ 909 951 function render_screen_layout() { 910 global $screen_layout_columns; 911 912 // Back compat for plugins using the filter instead of add_screen_option() 913 $columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this ); 914 915 if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) 916 $this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) ); 917 918 if ( ! $this->get_option('layout_columns') ) { 919 $screen_layout_columns = 0; 952 if ( ! $this->get_option('layout_columns') ) 920 953 return; 921 }922 954 923 $screen_layout_columns = get_user_option("screen_layout_$this->id");955 $screen_layout_columns = $this->get_columns(); 924 956 $num = $this->get_option( 'layout_columns', 'max' ); 925 957 926 if ( ! $screen_layout_columns || 'auto' == $screen_layout_columns ) {927 if ( $this->get_option( 'layout_columns', 'default' ) )928 $screen_layout_columns = $this->get_option( 'layout_columns', 'default' );929 }930 931 958 ?> 932 959 <h5 class="screen-layout"><?php _e('Screen Layout'); ?></h5> 933 960 <div class='columns-prefs'><?php -
wp-admin/edit-link-form.php
77 77 78 78 <div id="poststuff"> 79 79 80 <div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns? '1' : '2'; ?>">80 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>"> 81 81 <div id="post-body-content"> 82 82 <div id="namediv" class="stuffbox"> 83 83 <h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3> -
wp-admin/edit-form-advanced.php
277 277 278 278 <div id="poststuff"> 279 279 280 <div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns? '1' : '2'; ?>">280 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>"> 281 281 <div id="post-body-content"> 282 282 <?php if ( post_type_supports($post_type, 'title') ) { ?> 283 283 <div id="titlediv">