From 6780fa717c3e54c6124812f3e9b6705aef20e240 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 12 Jan 2010 21:28:33 +0000
Subject: [PATCH] Tidy up the mu-plugins loading code to make it more readable.
 Fix a couple of other tab/whitespace issues.

git-svn-id: http://svn.automattic.com/wordpress/trunk@12713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-settings.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/wp-settings.php b/wp-settings.php
index 900e49378..bef74ccea 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -488,22 +488,29 @@ if ( !defined( 'MUPLUGINDIR' ) )
 if ( is_dir( WPMU_PLUGIN_DIR ) ) {
 	if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
 		$mu_plugins = array ();
-		while ( ( $plugin = readdir( $dh ) ) !== false )
-			if ( substr( $plugin, -4 ) == '.php' )
+		while ( ( $plugin = readdir( $dh ) ) !== false ) {
+			if ( substr( $plugin, -4 ) == '.php' ) {
 				$mu_plugins[] = $plugin;
+			}
+		}
+		
 		closedir( $dh );
-                if( is_multisite() )
-        		sort( $mu_plugins );
-		foreach( $mu_plugins as $mu_plugin )
+
+		if( is_multisite() )
+			sort( $mu_plugins );
+		
+		foreach( $mu_plugins as $mu_plugin ) {
 			include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
+		}
 	}
 }
 /**
  * Used to load network wide plugins
  * @since 3.0
  */
-if( is_multisite() )
-        ms_network_plugins();
+if( is_multisite() ) {
+	ms_network_plugins();
+}
 
 do_action('muplugins_loaded');
 
@@ -512,15 +519,15 @@ do_action('muplugins_loaded');
  * @since 3.0
  */
 if( is_multisite() ) {
-    ms_site_check();
-    ms_network_cookies();
+	ms_site_check();
+	ms_network_cookies();
 }
 /**
  * Used to guarantee unique hash cookies
  * @since 1.5
  */
 if( !defined('COOKIEHASH') )
-        define('COOKIEHASH', md5(get_option('siteurl')));
+	define('COOKIEHASH', md5(get_option('siteurl')));
 
 /**
  * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php