X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..caeaf8dc94b5e3f75dc98ec92dc7b76049cdddb6:/wp-includes/default-constants.php?ds=sidebyside

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 4f135c82..ae97efdd 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -160,7 +160,8 @@ function wp_plugin_directory_constants() {
 function wp_cookie_constants() {
 	/**
 	 * Used to guarantee unique hash cookies
-	 * @since 1.5
+	 *
+	 * @since 1.5.0
 	 */
 	if ( !defined( 'COOKIEHASH' ) ) {
 		$siteurl = get_site_option( 'siteurl' );
@@ -246,16 +247,22 @@ function wp_ssl_constants() {
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('FORCE_SSL_ADMIN') )
-		define('FORCE_SSL_ADMIN', false);
-	force_ssl_admin(FORCE_SSL_ADMIN);
+	if ( !defined( 'FORCE_SSL_ADMIN' ) ) {
+		if ( 'https' === parse_url( get_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
+			define( 'FORCE_SSL_ADMIN', true );
+		} else {
+			define( 'FORCE_SSL_ADMIN', false );
+		}
+	}
+	force_ssl_admin( FORCE_SSL_ADMIN );
 
 	/**
 	 * @since 2.6.0
+	 * @deprecated 4.0.0
 	 */
-	if ( !defined('FORCE_SSL_LOGIN') )
-		define('FORCE_SSL_LOGIN', false);
-	force_ssl_login(FORCE_SSL_LOGIN);
+	if ( defined( 'FORCE_SSL_LOGIN' ) && FORCE_SSL_LOGIN ) {
+		force_ssl_admin( true );
+	}
 }
 
 /**
@@ -311,6 +318,6 @@ function wp_templating_constants() {
 	 * @since 3.0.0
 	 */
 	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentyfourteen' );
+		define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
 
 }