From ba04c52c007325890eb5abcde9f1ca77338209bd Mon Sep 17 00:00:00 2001
From: rboren <rboren@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 27 Jan 2005 15:20:48 +0000
Subject: [PATCH] Cleanup wp-l10n includes.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php      | 1 -
 wp-includes/wp-l10n.php | 4 ----
 wp-settings.php         | 3 +--
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index fdea2a4db..ff94b95f6 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,6 +1,5 @@
 <?php
 require_once('../wp-config.php');
-require_once(ABSPATH . 'wp-includes/wp-l10n.php');
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 auth_redirect();
 
diff --git a/wp-includes/wp-l10n.php b/wp-includes/wp-l10n.php
index 3ac7d0cbf..36152744c 100644
--- a/wp-includes/wp-l10n.php
+++ b/wp-includes/wp-l10n.php
@@ -1,8 +1,4 @@
 <?php
-$parentpath = dirname(dirname(__FILE__));
- 
-require_once($parentpath.'/wp-config.php');
-
 $locale = '';
 
 // WPLANG is defined in wp-config.
diff --git a/wp-settings.php b/wp-settings.php
index 7b50f1ba0..7d4ae09db 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -58,14 +58,13 @@ $tableoptions = $wpdb->options;
 $tablepostmeta = $wpdb->postmeta;
 
 require (ABSPATH . WPINC . '/functions.php');
+require_once (ABSPATH . WPINC . '/wp-l10n.php');
 
 $wpdb->hide_errors();
 if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') )
 	die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
 $wpdb->show_errors();
 
-require_once (ABSPATH . WPINC . '/wp-l10n.php');
-
 require (ABSPATH . WPINC . '/functions-formatting.php');
 require (ABSPATH . WPINC . '/functions-post.php');
 require (ABSPATH . WPINC . '/classes.php');