Changeset 12713 for trunk/wp-settings.php

Timestamp:

01/12/2010 09:28:33 PM (15 years ago)

Author:

westi

Message:

Tidy up the mu-plugins loading code to make it more readable.
Fix a couple of other tab/whitespace issues.

File:

• trunk/wp-settings.php (modified) (4 diffs)

trunk/wp-settings.php

@@ -489 +489 @@
     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 );
+        }
     }
 }
@@ -503 +509 @@
  * @since 3.0
  */
-if( is_multisite() )
-        ms_network_plugins();
+if( is_multisite() ) {
+    ms_network_plugins();
+}
 
 do_action('muplugins_loaded');
@@ -513 +520 @@
  */
 if( is_multisite() ) {
-    ms_site_check();
-    ms_network_cookies();
+    ms_site_check();
+    ms_network_cookies();
 }
 /**
@@ -521 +528 @@
  */
 if( !defined('COOKIEHASH') )
-        define('COOKIEHASH', md5(get_option('siteurl')));
+    define('COOKIEHASH', md5(get_option('siteurl')));
 
 /**