Ticket #20506: 20506.patch

wp-admin/edit-form-advanced.php

@@ -243 +243 @@
 require_once('./admin-header.php');
 ?>
 
-<div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>">
+<div class="wrap columns-<?php echo !empty( $screen_layout_columns ) ? (int) $screen_layout_columns : 'auto'; ?>">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
 <?php if ( $notice ) : ?>
@@ -277 +277 @@
 
 <div id="poststuff">
 
-<div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns ? '1' : '2'; ?>">
+<div id="post-body" class="metabox-holder columns-<?php echo !empty( $screen_layout_columns ) && 1 == $screen_layout_columns ? '1' : '2'; ?>">
 <div id="post-body-content">
 <?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">

wp-admin/edit-link-form.php

@@ -57 +57 @@
 require_once ('admin-header.php');
 ?>
 
-<div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>">
+<div class="wrap columns-<?php echo !empty( $screen_layout_columns ) ? (int) $screen_layout_columns : 'auto'; ?>">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
 
@@ -77 +77 @@
 
 <div id="poststuff">
 
-<div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns ? '1' : '2'; ?>">
+<div id="post-body" class="metabox-holder columns-<?php echo !empty( $screen_layout_columns ) && 1 == $screen_layout_columns ? '1' : '2'; ?>">
 <div id="post-body-content">
 <div id="namediv" class="stuffbox">
 <h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3>

wp-admin/includes/dashboard.php

@@ -196 +196 @@
         global $screen_layout_columns;
 
         $screen = get_current_screen();
-        $class = 'columns-' . $screen_layout_columns;
+        if ( !empty( $screen_layout_columns ) )
+                $class = 'columns-' . $screen_layout_columns;
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder <?php echo $class; ?>">