Merged in feature/280-dev-dev01 (pull request #21)

auto-patch  280-dev-dev01-2024-01-19T16_41_58

* auto-patch  280-dev-dev01-2024-01-19T16_41_58

wp/wp-content/plugins/contact-form-7/includes/functions.php

@@ -212,8 +212,12 @@ function wpcf7_validate_configuration() {
 /**
  * Returns true if wpcf7_autop() is applied.
  */
-function wpcf7_autop_or_not() {
-	return (bool) apply_filters( 'wpcf7_autop_or_not', WPCF7_AUTOP );
+function wpcf7_autop_or_not( $options = '' ) {
+	$options = wp_parse_args( $options, array(
+		'for' => 'form',
+	) );
+
+	return (bool) apply_filters( 'wpcf7_autop_or_not', WPCF7_AUTOP, $options );
 }
 
 

wp/wp-content/plugins/contact-form-7/includes/mail.php

@@ -6,7 +6,7 @@ add_filter( 'wpcf7_mail_html_body', 'wpcf7_mail_html_body_autop', 10, 1 );
  * Filter callback that applies auto-p to HTML email message body.
  */
 function wpcf7_mail_html_body_autop( $body ) {
-	if ( wpcf7_autop_or_not() ) {
+	if ( wpcf7_autop_or_not( array( 'for' => 'mail' ) ) ) {
 		$body = wpcf7_autop( $body );
 	}
 

wp/wp-content/plugins/contact-form-7/includes/submission.php

@@ -68,6 +68,14 @@ class WPCF7_Submission {
 	}
 
 
+	/**
+	 * Destructor.
+	 */
+	public function __destruct() {
+		$this->remove_uploaded_files();
+	}
+
+
 	/**
 	 * The main logic of submission.
 	 */
@@ -124,8 +132,6 @@ class WPCF7_Submission {
 					do_action( 'wpcf7_mail_failed', $contact_form );
 				}
 			}
-
-			$this->remove_uploaded_files();
 		};
 
 		wpcf7_switch_locale( $this->contact_form->locale(), $callback );