Changeset 28609 for trunk/src/wp-includes/default-constants.php

Timestamp:

05/29/2014 03:58:41 AM (10 years ago)

Author:

nacin

Message:

Forcing SSL logins now forces SSL for the entire admin, with no middle ground.

fixes #10267.

File:

• trunk/src/wp-includes/default-constants.php (modified) (1 diff)

trunk/src/wp-includes/default-constants.php

@@ -248 +248 @@
      * @since 2.6.0
      */
-    if ( !defined('FORCE_SSL_ADMIN') )
-        define('FORCE_SSL_ADMIN', false);
-    force_ssl_admin(FORCE_SSL_ADMIN);
-
-    /**
-     * @since 2.6.0
-     */
-    if ( !defined('FORCE_SSL_LOGIN') )
-        define('FORCE_SSL_LOGIN', false);
-    force_ssl_login(FORCE_SSL_LOGIN);
+    if ( !defined( 'FORCE_SSL_ADMIN' ) )
+        define( 'FORCE_SSL_ADMIN', false );
+    force_ssl_admin( FORCE_SSL_ADMIN );
+
+    /**
+     * @since 2.6.0
+     * @deprecated 4.0.0
+     */
+    if ( defined( 'FORCE_SSL_LOGIN' ) && FORCE_SSL_LOGIN ) {
+        force_ssl_admin( true );
+    }
 }