[wp-cvs] wordpress wp-blog-header.php,1.124,1.125

[Matthew Mullenweg]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Don't double-nest wp-admin. http://mosquito.wordpress.org/view.php?id=465

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** wp-blog-header.php	13 Feb 2005 21:25:08 -0000	1.124
--- wp-blog-header.php	14 Feb 2005 00:49:03 -0000	1.125
***************
*** 2,7 ****
  
  if (! isset($wp_did_header)):
! if ( !file_exists( dirname(__FILE__) . '/wp-config.php') )
!     die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
  
  $wp_did_header = true;
--- 2,10 ----
  
  if (! isset($wp_did_header)):
! if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
! 	if ( strstr( $_SERVER['PHP_SELF'], 'wp-admin') ) $path = '';
! 	else $path = 'wp-admin/';
!     die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
! }
  
  $wp_did_header = true;