Skip to content

Commit 1b74a5c

Browse files
timiwahalahtik1sul1
authored andcommitted
pass form object in all disable_validate_additional_fields filters
1 parent 2ebb73a commit 1b74a5c

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

classes/class-cpt-wplf-form.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,12 @@ public function meta_box_title_format( $post ) {
598598
?>
599599
<p><?php esc_html_e( 'Submissions from this form will use this formatting in their title.', 'wp-libre-form' ); ?></p>
600600
<p><?php esc_html_e( 'You may use any field values enclosed in "%" markers.', 'wp-libre-form' ); ?></p>
601-
<?php // translators: %submission-id% is not meant to be translated ?>
602-
<p><?php esc_html_e( 'In addition, you may use %submission-id%.', 'wp-libre-form' ); ?></p>
601+
<p>
602+
<?php
603+
// translators: %submission-id% is not meant to be translated
604+
esc_html_e( 'In addition, you may use %submission-id%.', 'wp-libre-form' );
605+
?>
606+
</p>
603607
<p>
604608
<input
605609
type="text"

inc/wplf-form-validation.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,20 @@ function wplf_validate_additional_fields( $return ) {
7575
return $return;
7676
}
7777

78-
// skip this validation if it is disabled with filter for this form
78+
// skip this validation if it is disabled with filter
7979
$form = get_post( intval( $_POST['_form_id'] ) );
80-
// global disable
8180
$disable_validation = false;
81+
82+
// global disable
8283
$disable_validation = apply_filters( 'wplf_disable_validate_additional_fields', $disable_validation, $form );
84+
8385
// disable by form id
84-
$disable_validation = apply_filters( "wplf_{$form->ID}_disable_validate_additional_fields", $disable_validation );
86+
$disable_validation = apply_filters( "wplf_{$form->ID}_disable_validate_additional_fields", $disable_validation, $form );
87+
8588
// disable by form slug
86-
$disable_validation = apply_filters( "wplf_{$form->post_name}_disable_validate_additional_fields", $disable_validation );
89+
$disable_validation = apply_filters( "wplf_{$form->post_name}_disable_validate_additional_fields", $disable_validation, $form );
90+
91+
// test form version and disable if form created before version 1.5.0
8792
$version_high_enough = version_compare( get_post_meta( $form->ID, '_wplf_plugin_version', true ), '1.5.0', '>=' );
8893

8994
if ( $disable_validation || ! $version_high_enough ) {

0 commit comments

Comments
 (0)