[wp-cvs] wordpress wp-settings.php,1.69,1.70

[Matthew Mullenweg]

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

Modified Files:
	wp-settings.php 
Log Message:
If we're already in wp-admin don't recursive link

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** wp-settings.php	29 Jan 2005 23:17:10 -0000	1.69
--- wp-settings.php	31 Jan 2005 10:28:53 -0000	1.70
***************
*** 62,67 ****
  
  $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();
  
--- 62,72 ----
  
  $wpdb->hide_errors();
! if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) {
! 	if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
! 		$link = 'install.php';
! 	else
! 		$link = 'wp-admin/install.php';
! 	die("It doesn't look like you've installed WP yet. Try running <a href='$link'>install.php</a>.");
! }
  $wpdb->show_errors();