[wp-cvs] wordpress wp-settings.php,1.65,1.66

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15255

Modified Files:
	wp-settings.php 
Log Message:
Do not include admin-functions from ugrade-functions to avoid circular dependency.  Move wp-l10n higher up in the wp-settings include chain. Bug 627.

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wp-settings.php	19 Dec 2004 07:26:43 -0000	1.65
--- wp-settings.php	15 Jan 2005 00:09:25 -0000	1.66
***************
*** 65,68 ****
--- 65,70 ----
  $wpdb->show_errors();
  
+ require_once (ABSPATH . WPINC . '/wp-l10n.php');
+ 
  require (ABSPATH . WPINC . '/functions-formatting.php');
  require (ABSPATH . WPINC . '/functions-post.php');
***************
*** 72,77 ****
  require (ABSPATH . WPINC . '/kses.php');
  
- require_once (ABSPATH . WPINC . '/wp-l10n.php');
- 
  if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
      $querystring_start = '?';
--- 74,77 ----