MW WP Form - Version 1.5.3

Version Description

  • Bug fix : Fixed a bug where
    is added in textarea.
Download this release

Release Info

Developer inc2734
Plugin Icon wp plugin MW WP Form
Version 1.5.3
Comparing to
See all releases

Code changes from version 1.5.2 to 1.5.3

Files changed (3) hide show
  1. form_fields/mw_form_field_textarea.php +3 -3
  2. mw-wp-form.php +12 -7
  3. readme.txt +4 -1
form_fields/mw_form_field_textarea.php CHANGED
@@ -3,11 +3,11 @@
3
  * Name: MW Form Field TextArea
4
  * URI: http://2inc.org
5
  * Description: テキストエリアを出力。
6
- * Version: 1.4.0
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : December 14, 2012
10
- * Modified: April 5, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
@@ -81,7 +81,7 @@ class mw_form_field_textarea extends mw_form_field {
81
  */
82
  protected function confirmPage() {
83
  $value = $this->Form->getValue( $this->atts['name'] );
84
- $_ret = nl2br( $value );
85
  $_ret .= $this->Form->hidden( $this->atts['name'], $value );
86
  return $_ret;
87
  }
3
  * Name: MW Form Field TextArea
4
  * URI: http://2inc.org
5
  * Description: テキストエリアを出力。
6
+ * Version: 1.4.1
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : December 14, 2012
10
+ * Modified: April 8, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
81
  */
82
  protected function confirmPage() {
83
  $value = $this->Form->getValue( $this->atts['name'] );
84
+ $_ret = nl2br( esc_html( $value ) );
85
  $_ret .= $this->Form->hidden( $this->atts['name'], $value );
86
  return $_ret;
87
  }
mw-wp-form.php CHANGED
@@ -3,11 +3,11 @@
3
  * Plugin Name: MW WP Form
4
  * Plugin URI: http://plugins.2inc.org/mw-wp-form/
5
  * Description: MW WP Form can create mail form with a confirmation screen.
6
- * Version: 1.5.2
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: April 6, 2014
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPL2
@@ -787,17 +787,22 @@ class mw_wp_form {
787
 
788
  // 入力画面・確認画面
789
  if ( $this->viewFlg == 'input' || $this->viewFlg == 'confirm' ) {
790
- $_ret ='[mwform]' . get_the_content() . '[/mwform]';
 
 
 
 
791
  }
792
  // 完了画面
793
  elseif( $this->viewFlg == 'complete' ) {
794
- $_ret = '[mwform_complete_message]' . $this->options_by_formkey['complete_message'] . '[/mwform_complete_message]';
 
 
 
 
795
  }
796
  wp_reset_postdata();
797
  $_ret = do_shortcode( $_ret );
798
- if ( has_filter( 'the_content', 'wpautop' ) ) {
799
- $_ret = wpautop( $_ret );
800
- }
801
  return $_ret;
802
  }
803
 
3
  * Plugin Name: MW WP Form
4
  * Plugin URI: http://plugins.2inc.org/mw-wp-form/
5
  * Description: MW WP Form can create mail form with a confirmation screen.
6
+ * Version: 1.5.3
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: April 8, 2014
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPL2
787
 
788
  // 入力画面・確認画面
789
  if ( $this->viewFlg == 'input' || $this->viewFlg == 'confirm' ) {
790
+ $content = get_the_content();
791
+ if ( has_filter( 'the_content', 'wpautop' ) ) {
792
+ $content = wpautop( $content );
793
+ }
794
+ $_ret ='[mwform]' . $content . '[/mwform]';
795
  }
796
  // 完了画面
797
  elseif( $this->viewFlg == 'complete' ) {
798
+ $content = $this->options_by_formkey['complete_message'];
799
+ if ( has_filter( 'the_content', 'wpautop' ) ) {
800
+ $content = wpautop( $content );
801
+ }
802
+ $_ret = '[mwform_complete_message]' . $content . '[/mwform_complete_message]';
803
  }
804
  wp_reset_postdata();
805
  $_ret = do_shortcode( $_ret );
 
 
 
806
  return $_ret;
807
  }
808
 
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.amazon.co.jp/registry/wishlist/39ANKRNSTNW40
4
  Tags: plugin, form, confirm, preview, shortcode, mail
5
  Requires at least: 3.4
6
  Tested up to: 3.8.1
7
- Stable tag: 1.5.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -54,6 +54,9 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
54
 
55
  == Changelog ==
56
 
 
 
 
57
  = 1.5.2 =
58
  * Bug fix : Datapicker starting a new line.
59
 
4
  Tags: plugin, form, confirm, preview, shortcode, mail
5
  Requires at least: 3.4
6
  Tested up to: 3.8.1
7
+ Stable tag: 1.5.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
54
 
55
  == Changelog ==
56
 
57
+ = 1.5.3 =
58
+ * Bug fix : Fixed a bug where <br> is added in textarea.
59
+
60
  = 1.5.2 =
61
  * Bug fix : Datapicker starting a new line.
62