From c34dc718967d5f7825caa73e817fb9e0bef046df Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Thu, 18 Oct 2012 13:19:59 +0100
Subject: [PATCH] Revert excessive indenting from 28433

Also remove indenting from else statement in the same block

Change-Id: I571880a4404fbc5a4804de9d3e2eb8f9d1501a37
---
 .../ResourceLoaderStartUpModule.php           | 77 ++++++++++---------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 49790473e7..1d36911fba 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -123,44 +123,45 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		foreach ( $resourceLoader->getModuleNames() as $name ) {
 			$module = $resourceLoader->getModule( $name );
 			$moduleTargets = $module->getTargets();
-			if ( in_array( $target, $moduleTargets ) ) {
-				$deps = $module->getDependencies();
-				$group = $module->getGroup();
-				$source = $module->getSource();
-				// Support module loader scripts
-				$loader = $module->getLoaderScript();
-				if ( $loader !== false ) {
-					$version = wfTimestamp( TS_ISO_8601_BASIC,
-						$module->getModifiedTime( $context ) );
-					$out .= ResourceLoader::makeCustomLoaderScript( $name, $version, $deps, $group, $source, $loader );
-				}
-				// Automatically register module
-				else {
-					// getModifiedTime() is supposed to return a UNIX timestamp, but it doesn't always
-					// seem to do that, and custom implementations might forget. Coerce it to TS_UNIX
-					$moduleMtime = wfTimestamp( TS_UNIX, $module->getModifiedTime( $context ) );
-					$mtime = max( $moduleMtime, wfTimestamp( TS_UNIX, $wgCacheEpoch ) );
-					// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
-					// mw.loader.register()
-					if ( !count( $deps ) && $group === null && $source === 'local' ) {
-						$registrations[] = array( $name, $mtime );
-					}
-					// Modules with dependencies but no group or foreign source pass three arguments
-					// (name, timestamp, dependencies) to mw.loader.register()
-					elseif ( $group === null && $source === 'local' ) {
-						$registrations[] = array( $name, $mtime, $deps );
-					}
-					// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
-					// to mw.loader.register()
-					elseif ( $source === 'local' ) {
-						$registrations[] = array( $name, $mtime, $deps, $group );
-					}
-					// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
-					// to mw.loader.register()
-					else {
-						$registrations[] = array( $name, $mtime, $deps, $group, $source );
-					}
-				}
+			if ( !in_array( $target, $moduleTargets ) ) {
+				continue;
+			}
+			$deps = $module->getDependencies();
+			$group = $module->getGroup();
+			$source = $module->getSource();
+			// Support module loader scripts
+			$loader = $module->getLoaderScript();
+			if ( $loader !== false ) {
+				$version = wfTimestamp( TS_ISO_8601_BASIC,
+					$module->getModifiedTime( $context ) );
+				$out .= ResourceLoader::makeCustomLoaderScript( $name, $version, $deps, $group, $source, $loader );
+				continue;
+			}
+
+			// Automatically register module
+			// getModifiedTime() is supposed to return a UNIX timestamp, but it doesn't always
+			// seem to do that, and custom implementations might forget. Coerce it to TS_UNIX
+			$moduleMtime = wfTimestamp( TS_UNIX, $module->getModifiedTime( $context ) );
+			$mtime = max( $moduleMtime, wfTimestamp( TS_UNIX, $wgCacheEpoch ) );
+			// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
+			// mw.loader.register()
+			if ( !count( $deps ) && $group === null && $source === 'local' ) {
+				$registrations[] = array( $name, $mtime );
+			}
+			// Modules with dependencies but no group or foreign source pass three arguments
+			// (name, timestamp, dependencies) to mw.loader.register()
+			elseif ( $group === null && $source === 'local' ) {
+				$registrations[] = array( $name, $mtime, $deps );
+			}
+			// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
+			// to mw.loader.register()
+			elseif ( $source === 'local' ) {
+				$registrations[] = array( $name, $mtime, $deps, $group );
+			}
+			// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
+			// to mw.loader.register()
+			else {
+				$registrations[] = array( $name, $mtime, $deps, $group, $source );
 			}
 		}
 		$out .= ResourceLoader::makeLoaderRegisterScript( $registrations );
-- 
2.20.1