WordPress 3.4

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

diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 9c6535e21a8025888f17c23c9875f287895a8168..4e5daabd4d2f2f07ed8a98e6d21ba7035b28b4ba 100644 (file)
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -105,7 +105,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 +130,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.

 }
 
 /**
 }
 
 /**


@@ -140,8 +140,6 @@ function wp_plugin_directory_constants( ) {
  * @since 3.0.0
  */
 function wp_cookie_constants( ) {
  * @since 3.0.0
  */
 function wp_cookie_constants( ) {

-       global $wp_default_secret_key;
-

        /**
         * Used to guarantee unique hash cookies
         * @since 1.5
        /**
         * Used to guarantee unique hash cookies
         * @since 1.5


@@ -154,12 +152,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
         */


@@ -304,5 +296,3 @@ function wp_templating_constants( ) {
                define( 'WP_DEFAULT_THEME', 'twentyeleven' );
 
 }
                define( 'WP_DEFAULT_THEME', 'twentyeleven' );
 
 }

-
-?>