Merge branch 'release/1.3.2'

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 1.3.2 (3/30/18)
+* Added: Force equal height fields when inline is true.
+* Fixed: Undefined variable in register form.
+* Fixed: first_name_label default if last_name field is showing.
+
 #### 1.3.1 (1/31/18)
 * Fixed: Password strength script not being loaded on registration forms.
 

css/wampum-forms.css

@@ -16,6 +16,15 @@
 	margin-left: 2px;
 }
 
+.wampum-form .row input[type="text"],
+.wampum-form .row input[type="email"],
+.wampum-form .row input[type="password"],
+.wampum-form .row button[type="submit"] {
+	height: 42px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+
 /* Autoprefixer wants these on their own, arghh */
 .wampum-form .wampum-field input:-moz-read-only,
 .wampum-form .wampum-field input:disabled {

includes/class-forms.php

@@ -601,7 +601,7 @@ function get_register_form( $args ) {
 			$form->add_field( 'text', array(
 				'name'  => 'first_name',
 				'class' => 'first-name',
-				'value' => $first_name,
+				'value' => '',
 			), array(
 				'label' => $first_name_label,
 			) );
@@ -614,7 +614,7 @@ function get_register_form( $args ) {
 			$form->add_field( 'text', array(
 				'name'  => 'last_name',
 				'class' => 'last-name',
-				'value' => $last_name,
+				'value' => '',
 			), array(
 				'label' => ! empty( $args['last_name_label'] ) ? $args['last_name_label'] : __( 'Last Name', 'wampum' ),
 			) );
@@ -1076,6 +1076,10 @@ function get_membership_form( $args ) {
 			if ( $args['first_name_label'] ) {
 				$first_name_label = $args['first_name_label'];
 			}
+			// Else if we are showing the last name
+			elseif ( $args['last_name'] ) {
+				$first_name_label = __( 'First Name', 'wampum' );
+			}
 			$join->add_field( 'text', array(
 				'name'  => 'first_name',
 				'class' => 'first-name',

wampum-forms.php

@@ -16,7 +16,7 @@
  * License:            GPL-2.0+
  * License URI:        http://www.gnu.org/licenses/gpl-2.0.txt
  *
- * Version:            1.3.1
+ * Version:            1.3.2
  *
  * GitHub Plugin URI:  https://github.com/bizbudding/wampum-forms
  * GitHub Branch:      master
@@ -123,7 +123,7 @@ public function __wakeup() {
 	private function setup_constants() {
 		// Plugin version.
 		if ( ! defined( 'WAMPUM_FORMS_VERSION' ) ) {
-			define( 'WAMPUM_FORMS_VERSION', '1.3.1' );
+			define( 'WAMPUM_FORMS_VERSION', '1.3.2' );
 		}
 		// Plugin Folder Path.
 		if ( ! defined( 'WAMPUM_FORMS_PLUGIN_DIR' ) ) {