[wp-cvs] wordpress wp-blog-header.php, 1.67, 1.68 wp-settings.php, 1.44, 1.45

[Matthew Mullenweg]

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

Modified Files:
	wp-blog-header.php wp-settings.php 
Log Message:
Changes to options system and query improvements.

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wp-settings.php	1 Jun 2004 02:00:44 -0000	1.44
--- wp-settings.php	10 Jun 2004 08:42:25 -0000	1.45
***************
*** 48,57 ****
  
  
- $wpdb->hide_errors();
- $users = $wpdb->get_results("SELECT * FROM $wpdb->users");
- if ( !$users && !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 (ABSPATH . WPINC . '/functions.php');
  require (ABSPATH . WPINC . '/functions-formatting.php');
--- 48,51 ----
***************
*** 61,64 ****
--- 55,63 ----
  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();
+ 
  if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) {
  

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** wp-blog-header.php	2 Jun 2004 05:16:44 -0000	1.67
--- wp-blog-header.php	10 Jun 2004 08:42:24 -0000	1.68
***************
*** 149,153 ****
  
  // Update some caches.
- update_user_cache();
  update_category_cache();
  
--- 149,152 ----