De-rabbit-hole compat.php

git-svn-id: http://svn.automattic.com/wordpress/trunk@6108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-09-13 05:24:31 +00:00 · 2007-09-13 05:24:31 +00:00 · 3fc1d4f08d
parent 76d0f29698
commit 3fc1d4f08d
2 changed files with 2 additions and 2 deletions
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@ -1,7 +1,5 @@
 <?php

-require_once(dirname(__FILE__).'/compat.php');
-
 function mysql2date($dateformatstring, $mysqlstring, $translate = true) {
 	global $wp_locale;
 	$m = $mysqlstring;
--- a/wp-settings.php
+++ b/wp-settings.php
@ -151,7 +151,9 @@ else

 wp_cache_init();

+require (ABSPATH . WPINC . '/compat.php');
 require (ABSPATH . WPINC . '/functions.php');
+
 require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/plugin.php');
 require (ABSPATH . WPINC . '/default-filters.php');