Completed
Pull Request — release-2.1 (#4266)
by Rick
07:23
created
Sources/Errors.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 		'cron',
86 86
 		'paidsubs',
87 87
 		'backup',
88
-        'login',
88
+		'login',
89 89
 	);
90 90
 
91 91
 	// This prevents us from infinite looping if the hook or call produces an error.
Please login to merge, or discard this patch.
Sources/Load.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -478,11 +478,11 @@
 block discarded – undo
478 478
 		{
479 479
 			require_once($sourcedir . '/LogInOut.php');
480 480
 			validatePasswordFlood(
481
-			    !empty($user_settings['id_member']) ? $user_settings['id_member'] : $id_member,
482
-                !empty($user_settings['member_name']) ? $user_settings['member_name'] : '',
483
-                !empty($user_settings['passwd_flood']) ? $user_settings['passwd_flood'] : false,
484
-                $id_member != 0
485
-            );
481
+				!empty($user_settings['id_member']) ? $user_settings['id_member'] : $id_member,
482
+				!empty($user_settings['member_name']) ? $user_settings['member_name'] : '',
483
+				!empty($user_settings['passwd_flood']) ? $user_settings['passwd_flood'] : false,
484
+				$id_member != 0
485
+			);
486 486
 		}
487 487
 		// Validate for Two Factor Authentication
488 488
 		elseif (!empty($modSettings['tfa_mode']) && $id_member && !empty($user_settings['tfa_secret']) && (empty($_REQUEST['action']) || !in_array($_REQUEST['action'], array('login2', 'logintfa'))))
Please login to merge, or discard this patch.