packages: wpmu/configpath.patch - install detection fix (logic error)

[glen]

Author: glen                         Date: Mon Jan 25 16:52:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install detection fix (logic error)

---- Files affected:
packages/wpmu:
   configpath.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/wpmu/configpath.patch
diff -u packages/wpmu/configpath.patch:1.5 packages/wpmu/configpath.patch:1.6
--- packages/wpmu/configpath.patch:1.5	Thu Jan 21 20:12:34 2010
+++ packages/wpmu/configpath.patch	Mon Jan 25 17:52:08 2010
@@ -70,15 +70,18 @@
  		$msg .= "<blockquote>$out</blockquote>";
  
  		echo "<div id='update-nag'>$msg</div>";
---- wpmu-2.9.1.1/wp-blog-header.php~	2010-01-21 21:00:31.000000000 +0200
-+++ wpmu-2.9.1.1/wp-blog-header.php	2010-01-21 21:01:27.924672241 +0200
-@@ -7,7 +7,8 @@
+--- wpmu/wp-blog-header.php~	2010-01-25 18:48:53.000000000 +0200
++++ wpmu/wp-blog-header.php	2010-01-25 18:50:13.104232987 +0200
+@@ -7,7 +7,11 @@
  
  if ( !isset($wp_did_header) ) {
  	// WPMU Runs installer if things aren't set up correctly
 -	if ( file_exists( dirname(__FILE__) . '/wp-config.php' ) || ( file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php' ) && ! file_exists( dirname( dirname(__FILE__) ) . '/wp-settings.php' ) ) ) {
-+	if (!filesize('/etc/webapps/wpmu/wp-config.php') &&
-+	   	!file_exists( dirname(__FILE__) . '/wp-config.php') && !file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
++	if (
++		filesize('/etc/webapps/wpmu/wp-config.php') ||
++		file_exists(dirname(__FILE__) . '/wp-config.php') ||
++		(file_exists(dirname(dirname(__FILE__) ) . '/wp-config.php') && !file_exists(dirname(dirname(__FILE__)) . '/wp-settings.php'))
++   	) {
  		$wp_did_header = true;
  
  		require_once( dirname(__FILE__) . '/wp-load.php' );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/configpath.patch?r1=1.5&r2=1.6&f=u