Custom Contact Forms - Version 6.7.3

Version Description

  • Fix WP SEO conflict rooted in a rewrites bug
Download this release

Release Info

Developer tlovett1
Plugin Icon 128x128 Custom Contact Forms
Version 6.7.3
Comparing to
See all releases

Code changes from version 6.7.2 to 6.7.3

Files changed (3) hide show
  1. classes/class-ccf-custom-contact-forms.php +18 -4
  2. custom-contact-forms.php +1 -1
  3. readme.txt +4 -1
classes/class-ccf-custom-contact-forms.php CHANGED
@@ -31,12 +31,15 @@ class CCF_Custom_Contact_Forms {
31
  $flush_rewrites = get_option( 'ccf_flush_rewrites' );
32
 
33
  if ( ! empty( $flush_rewrites ) ) {
34
- flush_rewrite_rules();
35
 
36
  delete_option( 'ccf_flush_rewrites' );
37
  }
38
  }
39
 
 
 
 
40
  public function permalink_warning() {
41
  $permalink_structure = get_option( 'permalink_structure' );
42
 
@@ -45,7 +48,7 @@ class CCF_Custom_Contact_Forms {
45
  <div class="update-nag">
46
  <?php printf( __( 'Custom Contact Forms will not work unless pretty permalinks (not default) are enabled. Please update your <a href="%s">permalinks settings</a>.', 'custom-contact-forms' ), esc_url( admin_url( 'options-permalink.php' ) ) ); ?>
47
  </div>
48
- <?php
49
  }
50
  }
51
 
@@ -92,7 +95,18 @@ class CCF_Custom_Contact_Forms {
92
 
93
  if ( ! empty( $pagenow ) ) {
94
  if ( 'plugins.php' === $pagenow && ( ! empty( $_GET['action'] ) && 'activate' === $_GET['action'] || ! empty( $_POST['checked'] ) ) ) {
95
- return;
 
 
 
 
 
 
 
 
 
 
 
96
  }
97
  }
98
 
@@ -100,7 +114,7 @@ class CCF_Custom_Contact_Forms {
100
  return;
101
  }
102
 
103
- require( dirname( __FILE__ ) . '/../vendor/wp-api/wp-api/plugin.php' );
104
  }
105
 
106
  /**
31
  $flush_rewrites = get_option( 'ccf_flush_rewrites' );
32
 
33
  if ( ! empty( $flush_rewrites ) ) {
34
+ add_action( 'shutdown', 'flush_rewrite_rules' );
35
 
36
  delete_option( 'ccf_flush_rewrites' );
37
  }
38
  }
39
 
40
+ /**
41
+ * Output permalink warning
42
+ */
43
  public function permalink_warning() {
44
  $permalink_structure = get_option( 'permalink_structure' );
45
 
48
  <div class="update-nag">
49
  <?php printf( __( 'Custom Contact Forms will not work unless pretty permalinks (not default) are enabled. Please update your <a href="%s">permalinks settings</a>.', 'custom-contact-forms' ), esc_url( admin_url( 'options-permalink.php' ) ) ); ?>
50
  </div>
51
+ <?php
52
  }
53
  }
54
 
95
 
96
  if ( ! empty( $pagenow ) ) {
97
  if ( 'plugins.php' === $pagenow && ( ! empty( $_GET['action'] ) && 'activate' === $_GET['action'] || ! empty( $_POST['checked'] ) ) ) {
98
+
99
+ if ( ! empty( $_POST['checked'] ) ) {
100
+ foreach ( $_POST['checked'] as $plugin ) {
101
+ if ( preg_match( '#json-rest-api#i', $plugin ) ) {
102
+ return;
103
+ }
104
+ }
105
+ } elseif ( ! empty( $_GET['plugin'] ) ) {
106
+ if ( preg_match( '#json-rest-api#i', $_GET['plugin'] ) ) {
107
+ return;
108
+ }
109
+ }
110
  }
111
  }
112
 
114
  return;
115
  }
116
 
117
+ require_once( dirname( __FILE__ ) . '/../vendor/wp-api/wp-api/plugin.php' );
118
  }
119
 
120
  /**
custom-contact-forms.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin URI: http://www.taylorlovett.com
5
  * Description: Build beautiful custom forms the WordPress way. View live previews of your forms while you build them.
6
  * Author: Taylor Lovett
7
- * Version: 6.7.2
8
  * Author URI: http://www.taylorlovett.com
9
  */
10
 
4
  * Plugin URI: http://www.taylorlovett.com
5
  * Description: Build beautiful custom forms the WordPress way. View live previews of your forms while you build them.
6
  * Author: Taylor Lovett
7
+ * Version: 6.7.3
8
  * Author URI: http://www.taylorlovett.com
9
  */
10
 
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
4
  Tags: contact form, web form, custom contact form, custom forms, captcha form, contact fields, form mailers, forms
5
  Requires at least: 3.9
6
  Tested up to: 4.3
7
- Stable tag: 6.7.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -35,6 +35,9 @@ For questions, feature requests, and support concerning the Custom Contact Forms
35
 
36
  == Changelog ==
37
 
 
 
 
38
  = 6.7.2 =
39
  * Allow forms to be emptied
40
  * Allow MCE previews to be re-rendered
4
  Tags: contact form, web form, custom contact form, custom forms, captcha form, contact fields, form mailers, forms
5
  Requires at least: 3.9
6
  Tested up to: 4.3
7
+ Stable tag: 6.7.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
35
 
36
  == Changelog ==
37
 
38
+ = 6.7.3 =
39
+ * Fix WP SEO conflict rooted in a rewrites bug
40
+
41
  = 6.7.2 =
42
  * Allow forms to be emptied
43
  * Allow MCE previews to be re-rendered