WordPress 3.3.2-scripts

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

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 47b9cd76ea492abb40f5b9286c09fd345c50107a..9c6535e21a8025888f17c23c9875f287895a8168 100644 (file)
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -24,6 +24,10 @@ function wp_initial_constants( ) {
                }
        }
 
                }
        }
 

+       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.
        /**
         * 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.


@@ -45,7 +49,8 @@ function wp_initial_constants( ) {
        if ( !defined('WP_DEBUG') )
                define( 'WP_DEBUG', false );
 
        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 );
 
        if ( !defined('WP_DEBUG_DISPLAY') )
                define( 'WP_DEBUG_DISPLAY', true );
 


@@ -263,6 +268,12 @@ function wp_functionality_constants( ) {
 
        if ( !defined('WP_POST_REVISIONS') )
                define('WP_POST_REVISIONS', true);
 
        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

 }
 
 /**
 }
 
 /**


@@ -272,13 +283,13 @@ function wp_functionality_constants( ) {
  */
 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());
 
        /**
         * @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());
         * @since 2.1.0
         */
        define('STYLESHEETPATH', get_stylesheet_directory());


@@ -290,7 +301,7 @@ 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', 'twentyten' );
+               define( 'WP_DEFAULT_THEME', 'twentyeleven' );

 
 }
 
 
 }