From ff71837a589b7bf28d4d7b4e66306f6fa30a9820 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Thu, 13 Sep 2007 05:24:31 +0000
Subject: [PATCH] De-rabbit-hole compat.php

git-svn-id: https://develop.svn.wordpress.org/trunk@6108 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/functions.php | 2 --
 wp-settings.php           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 36e48f0eaa..abc71c377a 100644
--- 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;
diff --git a/wp-settings.php b/wp-settings.php
index 3fe18b386f..86bf210d7b 100644
--- 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');