Wordpress 3.6

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

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 9c6535e21a8025888f17c23c9875f287895a8168..358c1018f33275566d61123488074bb9618376e6 100644 (file)
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -12,7 +12,7 @@
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

-function wp_initial_constants( ) {
+function wp_initial_constants() {

        global $blog_id;
 
        // set memory limits
        global $blog_id;
 
        // set memory limits


@@ -20,7 +20,7 @@ function wp_initial_constants( ) {
                if( is_multisite() ) {
                        define('WP_MEMORY_LIMIT', '64M');
                } else {
                if( is_multisite() ) {
                        define('WP_MEMORY_LIMIT', '64M');
                } else {

-                       define('WP_MEMORY_LIMIT', '32M');
+                       define('WP_MEMORY_LIMIT', '40M');

                }
        }
 
                }
        }
 


@@ -39,8 +39,11 @@ function wp_initial_constants( ) {
                $blog_id = 1;
 
        // set memory limits.
                $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' );
+               if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( intval( $current_limit ) < abs( intval( WP_MEMORY_LIMIT ) ) ) ) )
+                       @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
 
        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


@@ -69,6 +72,14 @@ function wp_initial_constants( ) {
 
        if ( !defined('SHORTINIT') )
                define('SHORTINIT', false);
 
        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    );

 }
 
 /**
 }
 
 /**


@@ -78,7 +89,7 @@ function wp_initial_constants( ) {
  *
  * @since 3.0.0
  */
  *
  * @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
 
        if ( !defined('WP_CONTENT_URL') )
                define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
 


@@ -105,7 +116,7 @@ function wp_plugin_directory_constants( ) {
         * @deprecated
         */
        if ( !defined('PLUGINDIR') )
         * @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.
 
        /**
         * Allows for the mu-plugins directory to be moved from the default location.


@@ -130,7 +141,7 @@ function wp_plugin_directory_constants( ) {
         * @deprecated
         */
        if ( !defined( 'MUPLUGINDIR' ) )
         * @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.

 }
 
 /**
 }
 
 /**


@@ -139,9 +150,7 @@ 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
  */
  * 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
        /**
         * Used to guarantee unique hash cookies
         * @since 1.5


@@ -154,12 +163,6 @@ function wp_cookie_constants( ) {
                        define( 'COOKIEHASH', '' );
        }
 
                        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
         */
        /**
         * @since 2.0.0
         */


@@ -232,7 +235,7 @@ function wp_cookie_constants( ) {
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

-function wp_ssl_constants( ) {
+function wp_ssl_constants() {

        /**
         * @since 2.6.0
         */
        /**
         * @since 2.6.0
         */


@@ -253,7 +256,7 @@ function wp_ssl_constants( ) {
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

-function wp_functionality_constants( ) {
+function wp_functionality_constants() {

        /**
         * @since 2.5.0
         */
        /**
         * @since 2.5.0
         */


@@ -281,7 +284,7 @@ function wp_functionality_constants( ) {
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

-function wp_templating_constants( ) {
+function wp_templating_constants() {

        /**
         * Filesystem path to the current active template directory
         * @since 1.5.0
        /**
         * Filesystem path to the current active template directory
         * @since 1.5.0


@@ -301,8 +304,6 @@ function wp_templating_constants( ) {
         * @since 3.0.0
         */
        if ( !defined('WP_DEFAULT_THEME') )
         * @since 3.0.0
         */
        if ( !defined('WP_DEFAULT_THEME') )

-               define( 'WP_DEFAULT_THEME', 'twentyeleven' );
+               define( 'WP_DEFAULT_THEME', 'twentythirteen' );

 
 }
 
 }

-
-?>