Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2021-06-05 13:57:59 +00:00
parent 47231831f7
commit 00ac778b90
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/options-media.php
View File

@ -18,7 +18,10 @@ $parent_file = 'options-general.php';
$media_options_help = '<p>' . __( 'You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.' ) . '</p>';
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 .= '<p>' . __( 'Uploading Files allows you to choose the folder and path for storing your uploaded files.' ) . '</p>';
}
@ -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' ) ) :
?>
<tr>
<th scope="row"><label for="upload_path"><?php _e( 'Store uploads in this folder' ); ?></label></th>

2
wp-includes/version.php
View File

@ -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.