X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5964d2279dc52bdfe105f9bfa17e04337d47a3fa..caeaf8dc94b5e3f75dc98ec92dc7b76049cdddb6:/wp-includes/default-constants.php

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index bc537a5e..ae97efdd 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -12,7 +12,7 @@
  *
  * @since 3.0.0
  */
-function wp_initial_constants( ) {
+function wp_initial_constants() {
 	global $blog_id;
 
 	// set memory limits
@@ -41,7 +41,14 @@ function wp_initial_constants( ) {
 	// set memory limits.
 	if ( function_exists( 'memory_get_usage' ) ) {
 		$current_limit = @ini_get( 'memory_limit' );
-		if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( intval( $current_limit ) < abs( intval( WP_MEMORY_LIMIT ) ) ) ) )
+		$current_limit_int = intval( $current_limit );
+		if ( false !== strpos( $current_limit, 'G' ) )
+			$current_limit_int *= 1024;
+		$wp_limit_int = intval( WP_MEMORY_LIMIT );
+		if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) )
+			$wp_limit_int *= 1024;
+
+		if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) )
 			@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
 	}
 
@@ -75,11 +82,11 @@ function wp_initial_constants( ) {
 
 	// Constants for expressing human-readable intervals
 	// in their respective number of seconds.
- 	define( 'MINUTE_IN_SECONDS', 60 );
- 	define( 'HOUR_IN_SECONDS',   60 * MINUTE_IN_SECONDS );
- 	define( 'DAY_IN_SECONDS',    24 * HOUR_IN_SECONDS   );
+	define( 'MINUTE_IN_SECONDS', 60 );
+	define( 'HOUR_IN_SECONDS',   60 * MINUTE_IN_SECONDS );
+	define( 'DAY_IN_SECONDS',    24 * HOUR_IN_SECONDS   );
 	define( 'WEEK_IN_SECONDS',    7 * DAY_IN_SECONDS    );
- 	define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
+	define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
 }
 
 /**
@@ -89,7 +96,7 @@ function wp_initial_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_plugin_directory_constants( ) {
+function wp_plugin_directory_constants() {
 	if ( !defined('WP_CONTENT_URL') )
 		define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
 
@@ -150,10 +157,11 @@ function wp_plugin_directory_constants( ) {
  * Defines constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
  * @since 3.0.0
  */
-function wp_cookie_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' );
@@ -235,20 +243,26 @@ function wp_cookie_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_ssl_constants( ) {
+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 );
+	}
 }
 
 /**
@@ -256,7 +270,7 @@ function wp_ssl_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_functionality_constants( ) {
+function wp_functionality_constants() {
 	/**
 	 * @since 2.5.0
 	 */
@@ -284,7 +298,7 @@ function wp_functionality_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_templating_constants( ) {
+function wp_templating_constants() {
 	/**
 	 * Filesystem path to the current active template directory
 	 * @since 1.5.0
@@ -304,6 +318,6 @@ function wp_templating_constants( ) {
 	 * @since 3.0.0
 	 */
 	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentytwelve' );
+		define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
 
 }