Commit df5581dd90 for wordpress.org
commit df5581dd903fd95ffa59999838b1b5bc81ff195a
Author: Weston Ruter <weston@xwp.co>
Date: Sat Jan 10 05:29:48 2026 +0000
Code Modernization: Use null coalescing operator in additional `isset()` ternaries.
These had been missed previously due to additional parentheses around the `isset()` expressions.
Developed in https://github.com/WordPress/wordpress-develop/pull/10704
Follow-up to [61463], [61457], [61456], [61455], [61454], [61453], [61445], [61444], [61443], [61442], [61436], [61435], [61434], [61403], [61433], [61432], [61431], [61430], [61429], [61424], [61404], [61403].
Props soean.
See #58874, #63430.
Built from https://develop.svn.wordpress.org/trunk@61464
git-svn-id: http://core.svn.wordpress.org/trunk@60776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index d51c9655e9..5f1716199b 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -105,14 +105,14 @@ class WP_Comments_List_Table extends WP_List_Table {
$comment_type = $_REQUEST['comment_type'];
}
- $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
+ $search = $_REQUEST['s'] ?? '';
$post_type = ( isset( $_REQUEST['post_type'] ) ) ? sanitize_key( $_REQUEST['post_type'] ) : '';
- $user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
+ $user_id = $_REQUEST['user_id'] ?? '';
- $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
- $order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : '';
+ $orderby = $_REQUEST['orderby'] ?? '';
+ $order = $_REQUEST['order'] ?? '';
$comments_per_page = $this->get_per_page( $comment_status );
diff --git a/wp-admin/network/edit.php b/wp-admin/network/edit.php
index f46896bd2b..f12251babe 100644
--- a/wp-admin/network/edit.php
+++ b/wp-admin/network/edit.php
@@ -10,7 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once __DIR__ . '/admin.php';
-$action = ( isset( $_GET['action'] ) ) ? $_GET['action'] : '';
+$action = $_GET['action'] ?? '';
if ( empty( $action ) ) {
wp_redirect( network_admin_url() );
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index ce278a861c..995ade9508 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -4449,7 +4449,7 @@ class wp_xmlrpc_server extends IXR_Server {
do_action( 'xmlrpc_call', 'wp.getMediaLibrary', $args, $this );
$parent_id = ( isset( $struct['parent_id'] ) ) ? absint( $struct['parent_id'] ) : '';
- $mime_type = ( isset( $struct['mime_type'] ) ) ? $struct['mime_type'] : '';
+ $mime_type = $struct['mime_type'] ?? '';
$offset = ( isset( $struct['offset'] ) ) ? absint( $struct['offset'] ) : 0;
$number = ( isset( $struct['number'] ) ) ? absint( $struct['number'] ) : -1;
diff --git a/wp-includes/css/dist/index.php b/wp-includes/css/dist/index.php
index 08835e2e0f..112aacc7cb 100644
--- a/wp-includes/css/dist/index.php
+++ b/wp-includes/css/dist/index.php
@@ -7,11 +7,6 @@
*/
return array(
- array(
- 'handle' => 'wp-list-reusable-blocks',
- 'path' => 'list-reusable-blocks/style',
- 'dependencies' => array('wp-components'),
- ),
array(
'handle' => 'wp-nux',
'path' => 'nux/style',
@@ -23,9 +18,9 @@ return array(
'dependencies' => array('wp-components'),
),
array(
- 'handle' => 'wp-reusable-blocks',
- 'path' => 'reusable-blocks/style',
- 'dependencies' => array('wp-block-editor', 'wp-components'),
+ 'handle' => 'wp-list-reusable-blocks',
+ 'path' => 'list-reusable-blocks/style',
+ 'dependencies' => array('wp-components'),
),
array(
'handle' => 'wp-commands',
@@ -33,8 +28,13 @@ return array(
'dependencies' => array('wp-components'),
),
array(
- 'handle' => 'wp-patterns',
- 'path' => 'patterns/style',
+ 'handle' => 'wp-components',
+ 'path' => 'components/style',
+ 'dependencies' => array(),
+ ),
+ array(
+ 'handle' => 'wp-reusable-blocks',
+ 'path' => 'reusable-blocks/style',
'dependencies' => array('wp-block-editor', 'wp-components'),
),
array(
@@ -43,9 +43,9 @@ return array(
'dependencies' => array('wp-block-editor', 'wp-components'),
),
array(
- 'handle' => 'wp-components',
- 'path' => 'components/style',
- 'dependencies' => array(),
+ 'handle' => 'wp-patterns',
+ 'path' => 'patterns/style',
+ 'dependencies' => array('wp-block-editor', 'wp-components'),
),
array(
'handle' => 'wp-format-library',
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 82a95c265e..9cdeef7578 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3351,7 +3351,7 @@ function wp_get_image_mime( $file ) {
$imagesize = @getimagesize( $file );
}
- $mime = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
+ $mime = $imagesize['mime'] ?? false;
} else {
$mime = false;
}
diff --git a/wp-includes/js/dist/script-modules/index.php b/wp-includes/js/dist/script-modules/index.php
index 73a9b0397f..1ec1a71635 100644
--- a/wp-includes/js/dist/script-modules/index.php
+++ b/wp-includes/js/dist/script-modules/index.php
@@ -12,6 +12,16 @@ return array(
'path' => 'interactivity/index',
'asset' => 'interactivity/index.min.asset.php',
),
+ array(
+ 'id' => '@wordpress/abilities',
+ 'path' => 'abilities/index',
+ 'asset' => 'abilities/index.min.asset.php',
+ ),
+ array(
+ 'id' => '@wordpress/core-abilities',
+ 'path' => 'core-abilities/index',
+ 'asset' => 'core-abilities/index.min.asset.php',
+ ),
array(
'id' => '@wordpress/interactivity-router',
'path' => 'interactivity-router/index',
@@ -22,11 +32,6 @@ return array(
'path' => 'interactivity-router/full-page',
'asset' => 'interactivity-router/full-page.min.asset.php',
),
- array(
- 'id' => '@wordpress/abilities',
- 'path' => 'abilities/index',
- 'asset' => 'abilities/index.min.asset.php',
- ),
array(
'id' => '@wordpress/latex-to-mathml',
'path' => 'latex-to-mathml/index',
@@ -43,20 +48,15 @@ return array(
'asset' => 'a11y/index.min.asset.php',
),
array(
- 'id' => '@wordpress/core-abilities',
- 'path' => 'core-abilities/index',
- 'asset' => 'core-abilities/index.min.asset.php',
+ 'id' => '@wordpress/edit-site-init',
+ 'path' => 'edit-site-init/index',
+ 'asset' => 'edit-site-init/index.min.asset.php',
),
array(
'id' => '@wordpress/route',
'path' => 'route/index',
'asset' => 'route/index.min.asset.php',
),
- array(
- 'id' => '@wordpress/edit-site-init',
- 'path' => 'edit-site-init/index',
- 'asset' => 'edit-site-init/index.min.asset.php',
- ),
array(
'id' => '@wordpress/lazy-editor',
'path' => 'lazy-editor/index',
diff --git a/wp-includes/post-formats.php b/wp-includes/post-formats.php
index 2c199e6dc0..9205ecb6e7 100644
--- a/wp-includes/post-formats.php
+++ b/wp-includes/post-formats.php
@@ -134,7 +134,7 @@ function get_post_format_string( $slug ) {
if ( ! $slug ) {
return $strings['standard'];
} else {
- return ( isset( $strings[ $slug ] ) ) ? $strings[ $slug ] : '';
+ return $strings[ $slug ] ?? '';
}
}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ee0d98b94f..a3598bbfb7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.0-alpha-61463';
+$wp_version = '7.0-alpha-61464';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.