From 1c176ffb1ea1941ae05023902317797976df1fdf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 1 Jun 2020 11:22:13 +0000
Subject: [PATCH] Docs: Correct and clarify an inline comment about the
 `upload_url_path` and `upload_path` options in `wp-admin/options-media.php`.

Synchronize it with a similar comment in `wp-admin/options.php`.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@47874


git-svn-id: http://core.svn.wordpress.org/trunk@47648 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-media.php | 6 +++++-
 wp-admin/options.php       | 6 +++++-
 wp-includes/version.php    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index eabf64db91..6236b20f6d 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -107,7 +107,11 @@ if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
 <h2 class="title"><?php _e( 'Uploading Files' ); ?></h2>
 <table class="form-table" role="presentation">
 	<?php
-	// If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty).
+	/*
+	 * If upload_url_path is not the default (empty),
+	 * 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' ) ) ) :
 		?>
 <tr>
diff --git a/wp-admin/options.php b/wp-admin/options.php
index fcbb960209..4b02b673c3 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -177,7 +177,11 @@ if ( ! is_multisite() ) {
 
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
-	// If upload_url_path and upload_path are both default values, they're locked.
+	/*
+	 * If upload_url_path is not the default (empty),
+	 * 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' ) ) ) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 94e798a8df..3b3997dc95 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47873';
+$wp_version = '5.5-alpha-47874';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.