X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..refs/tags/wordpress-3.4.2:/wp-includes/default-constants.php

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 47b9cd76..4e5daabd 100644
--- 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.
@@ -45,7 +49,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 );
 
@@ -100,7 +105,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 +130,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.
 }
 
 /**
@@ -135,8 +140,6 @@ function wp_plugin_directory_constants( ) {
  * @since 3.0.0
  */
 function wp_cookie_constants( ) {
-	global $wp_default_secret_key;
-
 	/**
 	 * Used to guarantee unique hash cookies
 	 * @since 1.5
@@ -149,12 +152,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
 	 */
@@ -263,6 +260,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
 }
 
 /**
@@ -272,13 +275,13 @@ function wp_functionality_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 +293,6 @@ function wp_templating_constants( ) {
 	 * @since 3.0.0
 	 */
 	if ( !defined('WP_DEFAULT_THEME') )
-		define( 'WP_DEFAULT_THEME', 'twentyten' );
+		define( 'WP_DEFAULT_THEME', 'twentyeleven' );
 
 }
-
-?>