Ticket #11589: 11589.diff

wp-config-sample.php

@@ -66 +66 @@
  */
 define ('WPLANG', '');
 
+/**
+ * Whether or not to make the functions that have been deprecated available.
+ * 
+ * Defaults to false for new installs but to true for old installs so that existing
+ * sites are not broken on upgrade
+ */
+define( 'WP_ENABLE_DEPRECATED_FUNCTIONS', false );
+
 /* That's all, stop editing! Happy blogging. */
 
 /** Absolute path to the WordPress directory. */

wp-settings.php

@@ -378 +378 @@
 require (ABSPATH . WPINC . '/kses.php');
 require (ABSPATH . WPINC . '/cron.php');
 require (ABSPATH . WPINC . '/version.php');
-require (ABSPATH . WPINC . '/deprecated.php');
 require (ABSPATH . WPINC . '/script-loader.php');
 require (ABSPATH . WPINC . '/taxonomy.php');
 require (ABSPATH . WPINC . '/update.php');
@@ -388 +387 @@
 require (ABSPATH . WPINC . '/http.php');
 require (ABSPATH . WPINC . '/widgets.php');
 
+/**
+ * Whether or not to make the functions we have deprecated available.
+ * 
+ * @since 3.0.0
+ */
+if ( !defined( 'WP_ENABLE_DEPRECATED_FUNCTIONS' ) )
+        define( 'WP_ENABLE_DEPRECATED_FUNCTIONS', true );
+
+if ( WP_ENABLE_DEPRECATED_FUNCTIONS )
+        require (ABSPATH . WPINC . '/deprecated.php');
+
+
+
 if ( !defined('WP_CONTENT_URL') )
         define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up