Splitting up wpcf7_autop_or_not for mail and form usage

[Zodiac1978]

The filter wpcf7_autop_or_not has a default value of true (via Constant) and is defined here:

contact-form-7/includes/functions.php

Lines 212 to 217 in 89df680

	/**
	* Returns true if wpcf7_autop() is applied.
	*/
	function wpcf7_autop_or_not() {
	return (bool) apply_filters( 'wpcf7_autop_or_not', WPCF7_AUTOP );
	}

But it is used for two places:

The mail body:

contact-form-7/includes/mail.php

Lines 5 to 14 in 89df680

	/**
	* Filter callback that applies auto-p to HTML email message body.
	*/
	function wpcf7_mail_html_body_autop( $body ) {
	if ( wpcf7_autop_or_not() ) {
	$body = wpcf7_autop( $body );
	}
	return $body;
	}

And the display of the form itself:

contact-form-7/includes/contact-form.php

Lines 865 to 884 in 89df680

	/**
	* Replaces all form-tags in the form template with corresponding HTML.
	*
	* @return string Replaced form content.
	*/
	public function replace_all_form_tags() {
	$manager = WPCF7_FormTagsManager::get_instance();
	$form = $this->prop( 'form' );
	if ( wpcf7_autop_or_not() ) {
	$form = $manager->replace_with_placeholders( $form );
	$form = wpcf7_autop( $form );
	$form = $manager->restore_from_placeholders( $form );
	}
	$form = $manager->replace_all( $form );
	$this->scanned_form_tags = $manager->get_scanned_tags();
	return $form;
	}

There are many add-on plugins which set this filter to false. I think this is because they need this either disabled for the mail OR the form, but not for both. Therefore producing unwanted side effects.

Here you can find all those add-ons which are setting this to false:
https://wpdirectory.net/search/01HJ0SSW2M68K12YT21JYB4K9Y

I would recommend splitting up this filter and have one for just the mail and one for the form to prevent side effects when you only want to tackle one location.

What do you think?

[takayukister]

I think you have a point. I'll add a parameter to the filter to make the usage distinguishable.