WordPress 4.1.4-scripts

[autoinstalls/wordpress.git] / wp-includes / default-constants.php

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 6be5dd0904d79715692034ad20ed48a43635be3e..ae97efdd776bb8ae011edd346ef115bb0710bbaf 100644 (file)
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -247,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 );
+       }
 }
 
 /**
@@ -312,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' );
 
 }