Index: wp-includes/js/tinymce/tiny_mce_config.php
===================================================================
--- wp-includes/js/tinymce/tiny_mce_config.php	(revision 7905)
+++ wp-includes/js/tinymce/tiny_mce_config.php	(working copy)
@@ -206,7 +206,7 @@
 }
 
 // Cache path, this is where the .gz files will be stored
-$cache_path = ABSPATH . 'wp-content/uploads/js_cache'; 
+$cache_path = ABSPATH . WP_CONTENT_DIR . '/uploads/js_cache'; 
 if ( $disk_cache && ! is_dir($cache_path) )
 	$disk_cache = wp_mkdir_p($cache_path);
 
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 7905)
+++ wp-includes/theme.php	(working copy)
@@ -333,11 +333,11 @@
 }
 
 function get_theme_root() {
-	return apply_filters('theme_root', ABSPATH . "wp-content/themes");
+	return apply_filters('theme_root', ABSPATH . WP_CONTENT_DIR . "/themes");
 }
 
 function get_theme_root_uri() {
-	return apply_filters('theme_root_uri', get_option('siteurl') . "/wp-content/themes", get_option('siteurl'));
+	return apply_filters('theme_root_uri', get_option('siteurl') . "/" . WP_CONTENT_DIR . "/themes", get_option('siteurl'));
 }
 
 function get_query_template($type) {
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 7905)
+++ wp-includes/functions.php	(working copy)
@@ -1080,7 +1080,7 @@
 	$siteurl = get_option( 'siteurl' );
 	$upload_path = get_option( 'upload_path' );
 	if ( trim($upload_path) === '' )
-		$upload_path = 'wp-content/uploads';
+		$upload_path = WP_CONTENT_DIR . '/uploads';
 	$dir = $upload_path;
 
 	// $dir is absolute, $path is (maybe) relative to ABSPATH
@@ -1558,8 +1558,8 @@
  */
 function require_wp_db() {
 	global $wpdb;
-	if ( file_exists( ABSPATH . 'wp-content/db.php' ) )
-		require_once( ABSPATH . 'wp-content/db.php' );
+	if ( file_exists( ABSPATH . WP_CONTENT_DIR . '/db.php' ) )
+		require_once( ABSPATH . WP_CONTENT_DIR . '/db.php' );
 	else
 		require_once( ABSPATH . WPINC . '/wp-db.php' );
 }
@@ -1568,8 +1568,8 @@
 	global $wpdb;
 
 	// Load custom DB error template, if present.
-	if ( file_exists( ABSPATH . 'wp-content/db-error.php' ) ) {
-		require_once( ABSPATH . 'wp-content/db-error.php' );
+	if ( file_exists( ABSPATH . WP_CONTENT_DIR . '/db-error.php' ) ) {
+		require_once( ABSPATH . WP_CONTENT_DIR . '/db-error.php' );
 		die();
 	}
 
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php	(revision 7905)
+++ wp-includes/comment-template.php	(working copy)
@@ -665,7 +665,7 @@
 	if ( file_exists( $include ) )
 		require( $include );
 	else
-		require( ABSPATH . 'wp-content/themes/default/comments.php');
+		require( ABSPATH . WP_CONTENT_DIR . '/themes/default/comments.php');
 }
 
 /**
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 7905)
+++ wp-includes/general-template.php	(working copy)
@@ -7,7 +7,7 @@
 	if ( file_exists( TEMPLATEPATH . '/header.php') )
 		load_template( TEMPLATEPATH . '/header.php');
 	else
-		load_template( ABSPATH . 'wp-content/themes/default/header.php');
+		load_template( ABSPATH . WP_CONTENT_DIR . '/themes/default/header.php');
 }
 
 
@@ -16,7 +16,7 @@
 	if ( file_exists( TEMPLATEPATH . '/footer.php') )
 		load_template( TEMPLATEPATH . '/footer.php');
 	else
-		load_template( ABSPATH . 'wp-content/themes/default/footer.php');
+		load_template( ABSPATH . WP_CONTENT_DIR . '/themes/default/footer.php');
 }
 
 
@@ -27,7 +27,7 @@
 	elseif ( file_exists( TEMPLATEPATH . '/sidebar.php') )
 		load_template( TEMPLATEPATH . '/sidebar.php');
 	else
-		load_template( ABSPATH . 'wp-content/themes/default/sidebar.php');
+		load_template( ABSPATH . WP_CONTENT_DIR . '/themes/default/sidebar.php');
 }
 
 
Index: wp-includes/rss.php
===================================================================
--- wp-includes/rss.php	(revision 7905)
+++ wp-includes/rss.php	(working copy)
@@ -651,7 +651,7 @@
 }
 
 class RSSCache {
-	var $BASE_CACHE = 'wp-content/cache';	// where the cache files are stored
+	var $BASE_CACHE = WP_CONTENT_DIR . '/cache';	// where the cache files are stored
 	var $MAX_AGE	= 43200;  		// when are files stale, default twelve hours
 	var $ERROR 		= '';			// accumulate error messages
 
Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 7905)
+++ wp-settings.php	(working copy)
@@ -100,7 +100,11 @@
 	die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.3.' );
 }
 
-if ( !extension_loaded('mysql') && !file_exists(ABSPATH . 'wp-content/db.php') )
+
+if ( !defined('WP_CONTENT_DIR') )
+	define( 'WP_CONTENT_DIR', 'wp-content' ); // no leading slash, no trailing slash, relative directories are OK
+
+if ( !extension_loaded('mysql') && !file_exists(ABSPATH . WP_CONTENT_DIR . '/db.php') )
 	die( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' );
 
 /**
@@ -166,7 +170,7 @@
 
 // For an advanced caching plugin to use, static because you would only want one
 if ( defined('WP_CACHE') )
-	@include ABSPATH . 'wp-content/advanced-cache.php';
+	@include ABSPATH . WP_CONTENT_DIR . '/advanced-cache.php';
 
 /**
  * Stores the location of the WordPress directory of functions, classes, and core content.
@@ -182,8 +186,8 @@
 	 *
 	 * @since 2.1.0
 	 */
-	if ( file_exists(ABSPATH . 'wp-content/languages') && @is_dir(ABSPATH . 'wp-content/languages') )
-		define('LANGDIR', 'wp-content/languages'); // no leading slash, no trailing slash
+	if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') )
+		define('LANGDIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash
 	else
 		define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash
 }
@@ -197,7 +201,7 @@
  * @since 2.1
  */
 if ( !defined('PLUGINDIR') )
-	define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash
+	define('PLUGINDIR', WP_CONTENT_DIR . '/plugins'); // no leading slash, no trailing slash
 
 require (ABSPATH . WPINC . '/compat.php');
 require (ABSPATH . WPINC . '/functions.php');
@@ -213,8 +217,8 @@
 if ( is_wp_error($prefix) )
 	wp_die('<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.');
 
-if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
-	require_once (ABSPATH . 'wp-content/object-cache.php');
+if ( file_exists(ABSPATH . WP_CONTENT_DIR . '/object-cache.php') )
+	require_once (ABSPATH . WP_CONTENT_DIR . '/object-cache.php');
 else
 	require_once (ABSPATH . WPINC . '/cache.php');
 
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 7905)
+++ wp-admin/includes/schema.php	(working copy)
@@ -226,10 +226,10 @@
 	if ( ini_get('safe_mode') ) {
 		// Safe mode screws up mkdir(), so we must use a flat structure.
 		add_option('uploads_use_yearmonth_folders', 0);
-		add_option('upload_path', 'wp-content');
+		add_option('upload_path', WP_CONTENT_DIR);
 	} else {
 		add_option('uploads_use_yearmonth_folders', 1);
-		add_option('upload_path', 'wp-content/uploads');
+		add_option('upload_path', WP_CONTENT_DIR . '/uploads');
 	}
 
 	// 2.0.3
Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php	(revision 7905)
+++ wp-admin/includes/file.php	(working copy)
@@ -46,7 +46,7 @@
 	if ( defined('WP_TEMP_DIR') )
 		return trailingslashit(WP_TEMP_DIR);
 
-	$temp = ABSPATH . 'wp-content/';
+	$temp = ABSPATH . WP_CONTENT_DIR . '/';
 	if ( is_dir($temp) && is_writable($temp) )
 		return $temp;
 
Index: wp-admin/includes/update.php
===================================================================
--- wp-admin/includes/update.php	(revision 7905)
+++ wp-admin/includes/update.php	(working copy)
@@ -179,7 +179,7 @@
 	if ( is_wp_error($file) )
 		return new WP_Error('download_failed', __('Download failed.'), $file->get_error_message());
 
-	$working_dir = $base . 'wp-content/upgrade/' . basename($plugin, '.php');
+	$working_dir = $base . WP_CONTENT_DIR . '/upgrade/' . basename($plugin, '.php');
 
 	// Clean up working directory
 	if ( $wp_filesystem->is_dir($working_dir) )
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 7905)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
-if ( file_exists(ABSPATH . 'wp-content/install.php') )
-	require (ABSPATH . 'wp-content/install.php');
+if ( file_exists(ABSPATH . WP_CONTENT_DIR . '/install.php') )
+	require (ABSPATH . WP_CONTENT_DIR . '/install.php');
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
 require_once(ABSPATH . 'wp-admin/includes/schema.php');
 
@@ -1077,7 +1077,7 @@
 
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
-	$site_dir = ABSPATH . "wp-content/themes/$template";
+	$site_dir = ABSPATH . WP_CONTENT_DIR . "/themes/$template";
 
 	if (! file_exists("$home_path/index.php"))
 		return false;
@@ -1096,7 +1096,7 @@
 		if ($oldfile == 'index.php') { // Check to make sure it's not a new index
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(ABSPATH . 'wp-content/themes/default/index.php', "$site_dir/$newfile"))
+				if (! @copy(ABSPATH . WP_CONTENT_DIR . '/themes/default/index.php', "$site_dir/$newfile"))
 					return false;
 				continue; // Don't copy anything
 				}
@@ -1144,8 +1144,8 @@
 }
 
 function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = ABSPATH . "wp-content/themes/$template";
-	$default_dir = ABSPATH . 'wp-content/themes/default';
+	$site_dir = ABSPATH . WP_CONTENT_DIR . "/themes/$template";
+	$default_dir = ABSPATH . WP_CONTENT_DIR . '/themes/default';
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
@@ -1202,7 +1202,7 @@
 	// Name the theme after the blog.
 	$theme_name = __get_option('blogname');
 	$template = sanitize_title($theme_name);
-	$site_dir = ABSPATH . "wp-content/themes/$template";
+	$site_dir = ABSPATH . WP_CONTENT_DIR . "/themes/$template";
 
 	// If the theme already exists, nothing to do.
 	if ( is_dir($site_dir)) {
@@ -1210,7 +1210,7 @@
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(ABSPATH . "wp-content/themes")) {
+	if (! is_writable(ABSPATH . WP_CONTENT_DIR . "/themes")) {
 		return false;
 	}
 
Index: wp-admin/import/mt.php
===================================================================
--- wp-admin/import/mt.php	(revision 7905)
+++ wp-admin/import/mt.php	(working copy)
@@ -179,7 +179,7 @@
 
 	function select_authors() {
 		if ( $_POST['upload_type'] === 'ftp' ) {
-			$file['file'] = ABSPATH . 'wp-content/mt-export.txt';
+			$file['file'] = ABSPATH . WP_CONTENT_DIR . '/mt-export.txt';
 			if ( !file_exists($file['file']) )
 				$file['error'] = __('<code>mt-export.txt</code> does not exist');
 		} else {
@@ -426,7 +426,7 @@
 	function import() {
 		$this->id = (int) $_GET['id'];
 		if ( $this->id == 0 )
-			$this->file = ABSPATH . 'wp-content/mt-export.txt';
+			$this->file = ABSPATH . WP_CONTENT_DIR . '/mt-export.txt';
 		else
 			$this->file = get_attached_file($this->id);
 		$this->get_authors_from_post();