WordPress 4.0

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

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 47b9cd76ea492abb40f5b9286c09fd345c50107a..334ea71b812eec8989a132eecc3a106bf2f279e4 100644 (file)
--- 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
@@ -20,10 +20,14 @@ function wp_initial_constants( ) {
                if( is_multisite() ) {
                        define('WP_MEMORY_LIMIT', '64M');
                } else {
-                       define('WP_MEMORY_LIMIT', '32M');
+                       define('WP_MEMORY_LIMIT', '40M');
                }
        }
 
+       if ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) ) {
+               define( 'WP_MAX_MEMORY_LIMIT', '256M' );
+       }
+
        /**
         * The $blog_id global, which you can change in the config allows you to create a simple
         * multiple blog installation using just one WordPress and changing $blog_id around.
@@ -35,8 +39,18 @@ function wp_initial_constants( ) {
                $blog_id = 1;
 
        // set memory limits.
-       if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
-               @ini_set('memory_limit', WP_MEMORY_LIMIT);
+       if ( function_exists( 'memory_get_usage' ) ) {
+               $current_limit = @ini_get( '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 );
+       }
 
        if ( !defined('WP_CONTENT_DIR') )
                define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
@@ -45,7 +59,8 @@ function wp_initial_constants( ) {
        if ( !defined('WP_DEBUG') )
                define( 'WP_DEBUG', false );
 
-       // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php use the globally configured setting for display_errors and not force errors to be displayed.
+       // Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for
+       // display_errors and not force errors to be displayed. Use false to force display_errors off.
        if ( !defined('WP_DEBUG_DISPLAY') )
                define( 'WP_DEBUG_DISPLAY', true );
 
@@ -64,6 +79,14 @@ function wp_initial_constants( ) {
 
        if ( !defined('SHORTINIT') )
                define('SHORTINIT', false);
+
+       // 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( 'WEEK_IN_SECONDS',    7 * DAY_IN_SECONDS    );
+       define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
 }
 
 /**
@@ -73,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
 
@@ -100,7 +123,7 @@ function wp_plugin_directory_constants( ) {
         * @deprecated
         */
        if ( !defined('PLUGINDIR') )
-               define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH.  For back compat.
+               define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
 
        /**
         * Allows for the mu-plugins directory to be moved from the default location.
@@ -125,7 +148,7 @@ function wp_plugin_directory_constants( ) {
         * @deprecated
         */
        if ( !defined( 'MUPLUGINDIR' ) )
-               define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH.  For back compat.
+               define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
 }
 
 /**
@@ -134,12 +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( ) {
-       global $wp_default_secret_key;
-
+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' );
@@ -149,12 +171,6 @@ function wp_cookie_constants( ) {
                        define( 'COOKIEHASH', '' );
        }
 
-       /**
-        * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
-        * @since 2.5.0
-        */
-       $wp_default_secret_key = 'put your unique phrase here';
-
        /**
         * @since 2.0.0
         */
@@ -227,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 );
+       }
 }
 
 /**
@@ -248,7 +270,7 @@ function wp_ssl_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_functionality_constants( ) {
+function wp_functionality_constants() {
        /**
         * @since 2.5.0
         */
@@ -263,6 +285,12 @@ function wp_functionality_constants( ) {
 
        if ( !defined('WP_POST_REVISIONS') )
                define('WP_POST_REVISIONS', true);
+
+       /**
+        * @since 3.3.0
+        */
+       if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) )
+               define('WP_CRON_LOCK_TIMEOUT', 60);  // In seconds
 }
 
 /**
@@ -270,15 +298,15 @@ function wp_functionality_constants( ) {
  *
  * @since 3.0.0
  */
-function wp_templating_constants( ) {
+function wp_templating_constants() {
        /**
-        * Web Path to the current active template directory
+        * Filesystem path to the current active template directory
         * @since 1.5.0
         */
        define('TEMPLATEPATH', get_template_directory());
 
        /**
-        * Web Path to the current active template stylesheet directory
+        * Filesystem path to the current active template stylesheet directory
         * @since 2.1.0
         */
        define('STYLESHEETPATH', get_stylesheet_directory());
@@ -290,8 +318,6 @@ function wp_templating_constants( ) {
         * @since 3.0.0
         */
        if ( !defined('WP_DEFAULT_THEME') )
-               define( 'WP_DEFAULT_THEME', 'twentyten' );
+               define( 'WP_DEFAULT_THEME', 'twentyfourteen' );
 
 }
-
-?>