Contact Form 7 - Version 2.0.4

Version Description

Download this release

Release Info

Developer takayukister
Plugin Icon 128x128 Contact Form 7
Version 2.0.4
Comparing to
See all releases

Code changes from version 2.0.3 to 2.0.4

Files changed (4) hide show
  1. README.txt +1 -1
  2. modules/checkbox.php +3 -2
  3. modules/select.php +6 -3
  4. wp-contact-form-7.php +2 -2
README.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://pledgie.com/campaigns/3117
4
  Tags: contact, contact form, email, ajax, captcha, akismet, WPML, multilingual
5
  Requires at least: 2.7
6
  Tested up to: 2.9-rare
7
- Stable tag: 2.0.3
8
 
9
  Just another contact form plugin. Simple but flexible.
10
 
4
  Tags: contact, contact form, email, ajax, captcha, akismet, WPML, multilingual
5
  Requires at least: 2.7
6
  Tested up to: 2.9-rare
7
+ Stable tag: 2.0.4
8
 
9
  Just another contact form plugin. Simple but flexible.
10
 
modules/checkbox.php CHANGED
@@ -15,6 +15,7 @@ function wpcf7_checkbox_shortcode_handler( $tag ) {
15
  $name = $tag['name'];
16
  $options = (array) $tag['options'];
17
  $values = (array) $tag['values'];
 
18
 
19
  if ( empty( $name ) )
20
  return '';
@@ -88,8 +89,8 @@ function wpcf7_checkbox_shortcode_handler( $tag ) {
88
 
89
  $checked = $checked ? ' checked="checked"' : '';
90
 
91
- if ( is_array( $tag['labels'] ) && isset( $tag['labels'][$key] ) )
92
- $label = $tag['labels'][$key];
93
  else
94
  $label = $value;
95
 
15
  $name = $tag['name'];
16
  $options = (array) $tag['options'];
17
  $values = (array) $tag['values'];
18
+ $labels = (array) $tag['labels'];
19
 
20
  if ( empty( $name ) )
21
  return '';
89
 
90
  $checked = $checked ? ' checked="checked"' : '';
91
 
92
+ if ( isset( $labels[$key] ) )
93
+ $label = $labels[$key];
94
  else
95
  $label = $value;
96
 
modules/select.php CHANGED
@@ -15,6 +15,7 @@ function wpcf7_select_shortcode_handler( $tag ) {
15
  $name = $tag['name'];
16
  $options = (array) $tag['options'];
17
  $values = (array) $tag['values'];
 
18
 
19
  if ( empty( $name ) )
20
  return '';
@@ -50,8 +51,10 @@ function wpcf7_select_shortcode_handler( $tag ) {
50
  $include_blank = (bool) preg_grep( '%^include_blank$%', $options );
51
 
52
  $empty_select = empty( $values );
53
- if ( $empty_select || $include_blank )
 
54
  array_unshift( $values, '---' );
 
55
 
56
  $html = '';
57
 
@@ -72,8 +75,8 @@ function wpcf7_select_shortcode_handler( $tag ) {
72
 
73
  $selected = $selected ? ' selected="selected"' : '';
74
 
75
- if ( is_array( $tag['labels'] ) && isset( $tag['labels'][$key] ) )
76
- $label = $tag['labels'][$key];
77
  else
78
  $label = $value;
79
 
15
  $name = $tag['name'];
16
  $options = (array) $tag['options'];
17
  $values = (array) $tag['values'];
18
+ $labels = (array) $tag['labels'];
19
 
20
  if ( empty( $name ) )
21
  return '';
51
  $include_blank = (bool) preg_grep( '%^include_blank$%', $options );
52
 
53
  $empty_select = empty( $values );
54
+ if ( $empty_select || $include_blank ) {
55
+ array_unshift( $labels, '---' );
56
  array_unshift( $values, '---' );
57
+ }
58
 
59
  $html = '';
60
 
75
 
76
  $selected = $selected ? ' selected="selected"' : '';
77
 
78
+ if ( isset( $labels[$key] ) )
79
+ $label = $labels[$key];
80
  else
81
  $label = $value;
82
 
wp-contact-form-7.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Contact Form 7
4
  Plugin URI: http://contactform7.com/
5
  Description: Just another contact form plugin. Simple but flexible.
6
  Author: Takayuki Miyoshi
7
- Version: 2.0.3
8
  Author URI: http://ideasilo.wordpress.com/
9
  */
10
 
@@ -25,7 +25,7 @@ Author URI: http://ideasilo.wordpress.com/
25
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26
  */
27
 
28
- define( 'WPCF7_VERSION', '2.0.3' );
29
 
30
  if ( ! defined( 'WPCF7_PLUGIN_BASENAME' ) )
31
  define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
4
  Plugin URI: http://contactform7.com/
5
  Description: Just another contact form plugin. Simple but flexible.
6
  Author: Takayuki Miyoshi
7
+ Version: 2.0.4
8
  Author URI: http://ideasilo.wordpress.com/
9
  */
10
 
25
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26
  */
27
 
28
+ define( 'WPCF7_VERSION', '2.0.4' );
29
 
30
  if ( ! defined( 'WPCF7_PLUGIN_BASENAME' ) )
31
  define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );