Skip to content

Commit 667cffa

Browse files
committed
Code Modernization: Script Loader: Use null coalescing operator instead of isset() ternaries.
Developed as a subset of #10654 Initially developed in #4886 Follow-up to [61436], [61435], [61434], [61403], [61433], [61432], [61431], [61430], [61429], [61424], [61404], [61403]. Props costdev, westonruter. See #58874, #63430. git-svn-id: https://develop.svn.wordpress.org/trunk@61442 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f49154e commit 667cffa

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/wp-includes/class-wp-scripts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ public function do_item( $handle, $group = false ) {
450450
}
451451

452452
// Determine fetchpriority.
453-
$original_fetchpriority = isset( $obj->extra['fetchpriority'] ) ? $obj->extra['fetchpriority'] : null;
453+
$original_fetchpriority = $obj->extra['fetchpriority'] ?? null;
454454
if ( null === $original_fetchpriority || ! $this->is_valid_fetchpriority( $original_fetchpriority ) ) {
455455
$original_fetchpriority = 'auto';
456456
}

src/wp-includes/class-wp-styles.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function do_item( $handle, $group = false ) {
203203
}
204204

205205
$rel = isset( $obj->extra['alt'] ) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
206-
$title = isset( $obj->extra['title'] ) ? $obj->extra['title'] : '';
206+
$title = $obj->extra['title'] ?? '';
207207

208208
$tag = sprintf(
209209
"<link rel='%s' id='%s-css'%s href='%s' media='%s' />\n",
@@ -230,7 +230,7 @@ public function do_item( $handle, $group = false ) {
230230

231231
if ( 'rtl' === $this->text_direction && isset( $obj->extra['rtl'] ) && $obj->extra['rtl'] ) {
232232
if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
233-
$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
233+
$suffix = $obj->extra['suffix'] ?? '';
234234
$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $src, $ver, "$handle-rtl" ) );
235235
} else {
236236
$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );

src/wp-includes/global-styles-and-settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function wp_add_global_styles_for_blocks() {
283283

284284
if ( $can_use_cached ) {
285285
// Use the block name as the key for cached CSS data. Otherwise, use a hash of the metadata.
286-
$cache_node_key = isset( $metadata['name'] ) ? $metadata['name'] : md5( wp_json_encode( $metadata ) );
286+
$cache_node_key = $metadata['name'] ?? md5( wp_json_encode( $metadata ) );
287287

288288
if ( isset( $cached['blocks'][ $cache_node_key ] ) ) {
289289
$block_css = $cached['blocks'][ $cache_node_key ];

src/wp-includes/script-loader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ function wp_localize_community_events() {
19841984

19851985
$user_id = get_current_user_id();
19861986
$saved_location = get_user_option( 'community-events-location', $user_id );
1987-
$saved_ip_address = isset( $saved_location['ip'] ) ? $saved_location['ip'] : false;
1987+
$saved_ip_address = $saved_location['ip'] ?? false;
19881988
$current_ip_address = WP_Community_Events::get_unsafe_client_ip();
19891989

19901990
/*

0 commit comments

Comments
 (0)