Revert [35804]. This change has unintended side effects, notably that media URLs in the admin area now unexpectedly use the `https` scheme. A more comprehensive approach will be taken in 4.5.

See #13941, #35120

Built from https://develop.svn.wordpress.org/trunk@36061


git-svn-id: http://core.svn.wordpress.org/trunk@36026 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/default-constants.php

@@ -132,7 +132,7 @@ function wp_initial_constants() {
  */
 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', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36059';
+$wp_version = '4.5-alpha-36061';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.