[wp-cvs] wordpress wp-settings.php,1.72,1.73

[Matthew Mullenweg]

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

Modified Files:
	wp-settings.php 
Log Message:
Include cleanups

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** wp-settings.php	2 Feb 2005 10:51:42 -0000	1.72
--- wp-settings.php	7 Feb 2005 07:25:30 -0000	1.73
***************
*** 36,48 ****
  
  // Table names
! $wpdb->posts               = $table_prefix . 'posts';
! $wpdb->users               = $table_prefix . 'users';
! $wpdb->categories          = $table_prefix . 'categories';
! $wpdb->post2cat            = $table_prefix . 'post2cat';
! $wpdb->comments            = $table_prefix . 'comments';
! $wpdb->links               = $table_prefix . 'links';
! $wpdb->linkcategories      = $table_prefix . 'linkcategories';
! $wpdb->options             = $table_prefix . 'options';
! $wpdb->postmeta            = $table_prefix . 'postmeta';
  
  if ( defined('CUSTOM_USER_TABLE') )
--- 36,48 ----
  
  // Table names
! $wpdb->posts            = $table_prefix . 'posts';
! $wpdb->users            = $table_prefix . 'users';
! $wpdb->categories       = $table_prefix . 'categories';
! $wpdb->post2cat         = $table_prefix . 'post2cat';
! $wpdb->comments         = $table_prefix . 'comments';
! $wpdb->links            = $table_prefix . 'links';
! $wpdb->linkcategories   = $table_prefix . 'linkcategories';
! $wpdb->options          = $table_prefix . 'options';
! $wpdb->postmeta         = $table_prefix . 'postmeta';
  
  if ( defined('CUSTOM_USER_TABLE') )
***************
*** 77,83 ****
  require (ABSPATH . WPINC . '/functions-post.php');
  require (ABSPATH . WPINC . '/classes.php');
! require (ABSPATH . WPINC . '/template-functions.php');
  require (ABSPATH . WPINC . '/links.php');
  require (ABSPATH . WPINC . '/kses.php');
  
  if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
--- 77,90 ----
  require (ABSPATH . WPINC . '/functions-post.php');
  require (ABSPATH . WPINC . '/classes.php');
! require (ABSPATH . WPINC . '/template-functions-general.php');
! require (ABSPATH . WPINC . '/template-functions-links.php');
! require (ABSPATH . WPINC . '/template-functions-author.php');
! require (ABSPATH . WPINC . '/template-functions-post.php');
! require (ABSPATH . WPINC . '/template-functions-category.php');
! require (ABSPATH . WPINC . '/comment-functions.php');
! require (ABSPATH . WPINC . '/feed-functions.php');
  require (ABSPATH . WPINC . '/links.php');
  require (ABSPATH . WPINC . '/kses.php');
+ require (ABSPATH . WPINC . '/version.php');
  
  if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :