Index: wp-admin/options-media.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/options-media.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/options-media.php	(revision )
@@ -17,7 +17,7 @@
 
 $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_DIR_NAME . '/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>';
 }
 
@@ -100,14 +100,14 @@
 <table class="form-table">
 <?php
 // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
-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_DIR_NAME . '/uploads' && get_option('upload_path') ) ) :
 ?>
 <tr>
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
 <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
 <p class="description"><?php
 	/* translators: %s: wp-content/uploads */
-	printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
+	printf( __( 'Default is %s' ), '<code>' . WP_CONTENT_DIR_NAME . '/uploads</code>' );
 ?></p>
 </td>
 </tr>
Index: wp-admin/plugins.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/plugins.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/plugins.php	(revision )
@@ -376,7 +376,7 @@
 		__( 'You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.' ),
 		'plugin-install.php',
 		'https://wordpress.org/plugins/',
-		'<code>/wp-content/plugins</code>'
+		'<code>/' . WP_CONTENT_DIR_NAME . '/plugins</code>'
 	) . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
Index: wp-includes/post.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/post.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-includes/post.php	(revision )
@@ -4878,8 +4878,8 @@
 			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
 				// Replace file location with url location.
 				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
-			} elseif ( false !== strpos($file, 'wp-content/uploads') ) {
-				$url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+			} elseif ( false !== strpos($file, WP_CONTENT_DIR_NAME . '/uploads') ) {
+				$url = $uploads['baseurl'] . substr( $file, strpos($file, WP_CONTENT_DIR_NAME . '/uploads') + 18 );
 			} else {
 				// It's a newly-uploaded file, therefore $file is relative to the basedir.
 				$url = $uploads['baseurl'] . "/$file";
Index: wp-admin/options.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/options.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/options.php	(revision )
@@ -116,7 +116,7 @@
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
 	// If upload_url_path and upload_path are both default values, 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_DIR_NAME . '/uploads' && get_option('upload_path') ) ) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
 	}
Index: wp-load.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-load.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-load.php	(revision )
@@ -65,7 +65,7 @@
 		exit;
 	}
 
-	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
+	define( 'WP_CONTENT_DIR', ABSPATH . WP_CONTENT_DIR_NAME );
 	require_once( ABSPATH . WPINC . '/version.php' );
 
 	wp_check_php_mysql_versions();
Index: wp-admin/includes/class-wp-upgrader.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/includes/class-wp-upgrader.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/includes/class-wp-upgrader.php	(revision )
@@ -2478,7 +2478,7 @@
 
 		foreach ( $checksums as $file => $checksum ) {
 			// Skip files which get updated
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+			if ( WP_CONTENT_DIR_NAME == substr( $file, 0, 10 ) )
 				continue;
 			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
 				return false;
Index: wp-includes/load.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/load.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-includes/load.php	(revision )
@@ -330,7 +330,7 @@
 			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
 			if ( !defined( 'LANGDIR' ) ) {
 				// Old static relative path maintained for limited backwards compatibility - won't work in some cases
-				define( 'LANGDIR', 'wp-content/languages' );
+				define( 'LANGDIR', WP_CONTENT_DIR_NAME . '/languages' );
 			}
 		} else {
 			/**
@@ -835,8 +835,8 @@
 		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
 			$locations[] = WP_CONTENT_DIR . '/languages';
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if ( @is_dir( ABSPATH . WP_CONTENT_DIR_NAME . '/languages' ) )
+			$locations[] = ABSPATH . WP_CONTENT_DIR_NAME . '/languages';
 
 		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
 			$locations[] = ABSPATH . WPINC . '/languages';
Index: wp-includes/ms-default-constants.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/ms-default-constants.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-includes/ms-default-constants.php	(revision )
@@ -28,7 +28,7 @@
 
 	// Base uploads dir relative to ABSPATH
 	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+		define( 'UPLOADBLOGSDIR', WP_CONTENT_DIR_NAME . '/blogs.dir' );
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
@@ -36,7 +36,7 @@
 		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
+		if ( WP_CONTENT_DIR_NAME . '/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
 			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
 	}
 }
Index: wp-admin/includes/update-core.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/includes/update-core.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/includes/update-core.php	(revision )
@@ -880,7 +880,7 @@
 
 	// Don't copy wp-content, we'll deal with that below
 	// We also copy version.php last so failed updates report their old version
-	$skip = array( 'wp-content', 'wp-includes/version.php' );
+	$skip = array( WP_CONTENT_DIR_NAME, 'wp-includes/version.php' );
 	$check_is_writable = array();
 
 	// Check to see which files don't really need updating - only available for 3.7 and higher
@@ -893,7 +893,7 @@
 			$checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
 		if ( is_array( $checksums ) ) {
 			foreach ( $checksums as $file => $checksum ) {
-				if ( 'wp-content' == substr( $file, 0, 10 ) )
+				if ( WP_CONTENT_DIR_NAME == substr( $file, 0, 10 ) )
 					continue;
 				if ( ! file_exists( ABSPATH . $file ) )
 					continue;
@@ -952,11 +952,11 @@
 	}
 
 	// Check to make sure everything copied correctly, ignoring the contents of wp-content
-	$skip = array( 'wp-content' );
+	$skip = array( WP_CONTENT_DIR_NAME );
 	$failed = array();
 	if ( isset( $checksums ) && is_array( $checksums ) ) {
 		foreach ( $checksums as $file => $checksum ) {
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+			if ( WP_CONTENT_DIR_NAME == substr( $file, 0, 10 ) )
 				continue;
 			if ( ! file_exists( $working_dir_local . $file ) )
 				continue;
@@ -989,7 +989,7 @@
 
 	// Custom Content Directory needs updating now.
 	// Copy Languages
-	if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) {
+	if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . WP_CONTENT_DIR_NAME . '/languages') ) {
 		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) )
 			$lang_dir = WP_LANG_DIR;
 		else
@@ -1003,7 +1003,7 @@
 		if ( @is_dir($lang_dir) ) {
 			$wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
 			if ( $wp_lang_dir ) {
-				$result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
+				$result = copy_dir($from . $distro . WP_CONTENT_DIR_NAME . '/languages/', $wp_lang_dir);
 				if ( is_wp_error( $result ) )
 					$result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
 			}
@@ -1033,7 +1033,7 @@
 				list($type, $filename) = explode('/', $file, 2);
 
 				// Check to see if the bundled items exist before attempting to copy them
-				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
+				if ( ! $wp_filesystem->exists( $from . $distro . WP_CONTENT_DIR_NAME . '/' . $file ) )
 					continue;
 
 				if ( 'plugins' == $type )
@@ -1047,14 +1047,14 @@
 					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) )
 						continue;
 
-					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
+					if ( ! $wp_filesystem->copy($from . $distro . WP_CONTENT_DIR_NAME . '/' . $file, $dest . $filename, FS_CHMOD_FILE) )
 						$result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
 				} else {
 					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
 						continue;
 
 					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
-					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
+					$_result = copy_dir( $from . $distro . WP_CONTENT_DIR_NAME . '/' . $file, $dest . $filename);
 
 					// If a error occurs partway through this final step, keep the error flowing through, but keep process going.
 					if ( is_wp_error( $_result ) ) {
Index: wp-includes/default-constants.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/default-constants.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-includes/default-constants.php	(revision )
@@ -47,8 +47,11 @@
 			@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
 	}
 
+	if ( !defined('WP_CONTENT_DIR_NAME') )
+		define( 'WP_CONTENT_DIR_NAME', 'wp-content' );
+
 	if ( !defined('WP_CONTENT_DIR') )
-		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+		define( 'WP_CONTENT_DIR', ABSPATH . WP_CONTENT_DIR_NAME ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
 
 	// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
 	if ( !defined('WP_DEBUG') )
@@ -132,7 +135,7 @@
  */
 function wp_plugin_directory_constants() {
 	if ( !defined('WP_CONTENT_URL') )
-		define( 'WP_CONTENT_URL', site_url() . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+		define( 'WP_CONTENT_URL', site_url() . '/' . WP_CONTENT_DIR_NAME); // full url - WP_CONTENT_DIR is defined further up
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
@@ -157,7 +160,7 @@
 	 * @deprecated
 	 */
 	if ( !defined('PLUGINDIR') )
-		define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+		define( 'PLUGINDIR', WP_CONTENT_DIR_NAME . '/plugins' ); // Relative to ABSPATH. For back compat.
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
@@ -182,7 +185,7 @@
 	 * @deprecated
 	 */
 	if ( !defined( 'MUPLUGINDIR' ) )
-		define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
+		define( 'MUPLUGINDIR', WP_CONTENT_DIR_NAME . '/mu-plugins' ); // Relative to ABSPATH. For back compat.
 }
 
 /**
Index: wp-admin/includes/network.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-admin/includes/network.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-admin/includes/network.php	(revision )
@@ -215,7 +215,7 @@
 <?php
 	endif;
 
-		if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
+		if ( WP_CONTENT_DIR != ABSPATH . WP_CONTENT_DIR_NAME && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
 			echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
 
 		$is_www = ( 0 === strpos( $hostname, 'www.' ) );
@@ -522,7 +522,7 @@
 			'<code>' . $home_path . '</code>'
 		);
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . WP_CONTENT_DIR_NAME )
 			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
 		?>
 		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
@@ -562,7 +562,7 @@
 			'<code>' . $home_path . '</code>'
 		);
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . WP_CONTENT_DIR_NAME )
 			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
 		?>
 		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
\ No newline at end of file
Index: wp-includes/functions.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/functions.php	(revision 6fdd27a1d6ecd1492b3129b02353883f6478f1fc)
+++ wp-includes/functions.php	(revision )
@@ -1813,7 +1813,7 @@
 	$siteurl = get_option( 'siteurl' );
 	$upload_path = trim( get_option( 'upload_path' ) );
 
-	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
+	if ( empty( $upload_path ) || WP_CONTENT_DIR_NAME . '/uploads' == $upload_path ) {
 		$dir = WP_CONTENT_DIR . '/uploads';
 	} elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
 		// $dir is absolute, $upload_path is (maybe) relative to ABSPATH
@@ -1823,7 +1823,7 @@
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
+		if ( empty($upload_path) || ( WP_CONTENT_DIR_NAME . '/uploads' == $upload_path ) || ( $upload_path == $dir ) )
 			$url = WP_CONTENT_URL . '/uploads';
 		else
 			$url = trailingslashit( $siteurl ) . $upload_path;