From 00ac778b90ca2f9754dd830f7d807cc8a3fe78d2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 5 Jun 2021 13:57:59 +0000 Subject: [PATCH] Coding Standards: Use strict comparison in `wp-admin/options-media.php`. See #52627. Built from https://develop.svn.wordpress.org/trunk@51075 git-svn-id: http://core.svn.wordpress.org/trunk@50684 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/options-media.php | 8 ++++++-- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index 6236b20f6d..89e0baa67c 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -18,7 +18,10 @@ $parent_file = 'options-general.php'; $media_options_help = '

' . __( 'You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.' ) . '

'; -if ( ! is_multisite() && ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) ) { +if ( ! is_multisite() + && ( get_option( 'upload_url_path' ) + || get_option( 'upload_path' ) && 'wp-content/uploads' !== get_option( 'upload_path' ) ) +) { $media_options_help .= '

' . __( 'Uploading Files allows you to choose the folder and path for storing your uploaded files.' ) . '

'; } @@ -112,7 +115,8 @@ if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) : * or upload_path is not the default ('wp-content/uploads' or empty), * they can be edited, otherwise they're locked. */ - if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) : + if ( get_option( 'upload_url_path' ) + || get_option( 'upload_path' ) && 'wp-content/uploads' !== get_option( 'upload_path' ) ) : ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index e796db5d1f..9ac6b2ea19 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-51074'; +$wp_version = '5.8-alpha-51075'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.