Eliminate getting layout_columns option twice

westonruter · westonruter · commit 0eb1b4f0e309 · 2025-11-23T17:26:57.000-08:00
diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php
@@ -951,8 +951,9 @@ public function render_screen_meta() {
 		if ( $this->get_option( 'layout_columns' ) ) {
 			$this->columns = (int) get_user_option( "screen_layout_$this->id" );
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {
-				$this->columns = (int) $this->get_option( 'layout_columns', 'default' );
+			$layout_columns = (int) $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $layout_columns ) {
+				$this->columns = $layout_columns;
 			}
 		}
 		$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.

Original file line number	Diff line number	Diff line change
`@@ -951,8 +951,9 @@ public function render_screen_meta() {`
`951`	`951`	`if ( $this->get_option( 'layout_columns' ) ) {`
`952`	`952`	`$this->columns = (int) get_user_option( "screen_layout_$this->id" );`
`953`	`953`
`954`		`- if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {`
`955`		`- $this->columns = (int) $this->get_option( 'layout_columns', 'default' );`
	`954`	`+ $layout_columns = (int) $this->get_option( 'layout_columns', 'default' );`
	`955`	`+ if ( ! $this->columns && $layout_columns ) {`
	`956`	`+ $this->columns = $layout_columns;`
`956`	`957`	`}`
`957`	`958`	`}`
`958`	`959`	`$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.`