Merge branch '3.3.x'

marc1706 · Jul 28, 2024 · 6747c4e · 6747c4e
2 parents d7d238c + 935c1a3
commit 6747c4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php
@@ -361,6 +361,7 @@ protected function recaptcha_verify_token()
 		if ($result->isSuccess())
 		{
 			$this->solved = true;
+			$this->confirm_code = $this->code;
 
 			return false;
 		}

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
@@ -337,30 +337,6 @@ $('[data-ajax]').each(function() {
 	}
 });
 
-// Prevent accidental double submission of form
-$('[data-prevent-flood] input[type=submit]').click(function(event) {
-	const $submitButton = $(this); // Store the button element
-	const $form = $submitButton.closest('form');
-
-	// Always add the disabled class for visual feedback
-	$submitButton.addClass('disabled');
-
-	// Submit form if it hasn't been submitted yet
-	if (!$form.prop('data-form-submitted')) {
-		$form.prop('data-form-submitted', true);
-
-		return;
-	}
-
-	// Prevent default submission for subsequent clicks within 5 seconds
-	event.preventDefault();
-
-	setTimeout(() => {
-		$form.prop('removeProp', 'data-form-submitted');
-		$submitButton.removeClass('disabled'); // Re-enable after 5 seconds
-	}, 5000);
-});
-
 /**
  * This simply appends #preview to the action of the
  * QR action when you click the Full Editor & Preview button

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
@@ -97,7 +97,7 @@
 	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
 	<div class="panel bg2">
 		<div class="inner">
-		<fieldset class="submit-buttons" data-prevent-flood>
+		<fieldset class="submit-buttons">
 			{S_HIDDEN_ADDRESS_FIELD}
 			{S_HIDDEN_FIELDS}
 			<!-- EVENT posting_editor_submit_buttons -->