Completed
Pull Request — master (#1203)
by Devin
20:46
created
includes/admin/upgrades/upgrades.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,11 +64,14 @@
 block discarded – undo
64 64
 				}, 250 );
65 65
 			</script>
66 66
 
67
-		<?php else : ?>
67
+		<?php else {
68
+	: ?>
68 69
 
69 70
 			<div id="give-upgrade-status">
70 71
 				<p style="font-size: 20px;max-width: 900px;">
71
-					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
72
+					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' );
73
+}
74
+?>
72 75
 					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
73 76
 				</p>
74 77
 			</div>
Please login to merge, or discard this patch.
includes/class-give-license-handler.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -689,7 +689,7 @@
 block discarded – undo
689 689
 								"{$this->checkout_url}?edd_license_key={$subscription['license_key']}&utm_campaign=admin&utm_source=licenses&utm_medium=expired",
690 690
 								esc_url( add_query_arg( '_give_hide_license_notices_permanently', $subscription['id'], $_SERVER['REQUEST_URI'] ) )
691 691
 							);
692
-						}else{
692
+						} else{
693 693
 							$messages[$subscription['id']] = sprintf(
694 694
 								__( 'You Give addon license will expire in %s for payment <a href="%s" target="_blank">#%d</a>. <a href="%s" target="_blank">Click to renew an existing license</a> or <a href="%s">Click here if already renewed</a>.', 'give' ),
695 695
 								human_time_diff( current_time( 'timestamp', 1 ), strtotime( $subscription['expires'] ) ),
Please login to merge, or discard this patch.
includes/shortcodes.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -425,11 +425,11 @@
 block discarded – undo
425 425
 		// Make sure email should not be empty.
426 426
 		give_set_error( 'email_empty', esc_html__( 'The email you entered is empty.', 'give' ) );
427 427
 
428
-	}else if ( ! is_email( $email ) ){
428
+	} else if ( ! is_email( $email ) ){
429 429
 		// Make sure email should be valid.
430 430
 		give_set_error( 'email_not_valid', esc_html__( 'The email you entered is not valid. Please use another', 'give' ) );
431 431
 
432
-	}else if ( $email != $old_user_data->user_email ) {
432
+	} else if ( $email != $old_user_data->user_email ) {
433 433
 		// Make sure the new email doesn't belong to another user
434 434
 		if ( email_exists( $email ) ) {
435 435
 			give_set_error( 'email_exists', esc_html__( 'The email you entered belongs to another user. Please use another.', 'give' ) );
Please login to merge, or discard this patch.
includes/forms/template.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1001,8 +1001,11 @@  discard block
 block discarded – undo
1001 1001
 					}
1002 1002
 					?>
1003 1003
 				</select>
1004
-			<?php else : ?>
1005
-				<input type="text" size="6" name="card_state" id="card_state" class="card_state give-input" placeholder="<?php esc_attr_e( 'State / Province', 'give' ); ?>"/>
1004
+			<?php else {
1005
+	: ?>
1006
+				<input type="text" size="6" name="card_state" id="card_state" class="card_state give-input" placeholder="<?php esc_attr_e( 'State / Province', 'give' );
1007
+}
1008
+?>"/>
1006 1009
 			<?php endif; ?>
1007 1010
 		</p>
1008 1011
 		<?php
@@ -1288,7 +1291,10 @@  discard block
 block discarded – undo
1288 1291
 	do_action( 'give_payment_mode_top', $form_id );
1289 1292
 	?>
1290 1293
 
1291
-	<fieldset id="give-payment-mode-select" <?php if ( count($gateways) <= 1 ) echo 'style="display: none;"'; ?>>
1294
+	<fieldset id="give-payment-mode-select" <?php if ( count($gateways) <= 1 ) {
1295
+	echo 'style="display: none;"';
1296
+}
1297
+?>>
1292 1298
 		<?php
1293 1299
 		/**
1294 1300
 		 * Fires while selecting payment gateways, before the wrap div.
Please login to merge, or discard this patch.
includes/admin/give-metabox-functions.php 1 patch
Braces   +12 added lines, -3 removed lines patch added patch discarded remove patch
@@ -713,7 +713,10 @@  discard block
 block discarded – undo
713 713
 						</div>
714 714
 						<div class="give-row-body">
715 715
 							<?php foreach ( $fields['fields'] as $field ) : ?>
716
-								<?php if ( ! give_is_field_callback_exist( $field ) ) continue; ?>
716
+								<?php if ( ! give_is_field_callback_exist( $field ) ) {
717
+	continue;
718
+}
719
+?>
717 720
 								<?php
718 721
 								$field['repeat'] = true;
719 722
 								$field['repeatable_field_id'] = ( '_give_id' === $field['id'] ) ? "{$fields['id']}[{{row-count-placeholder}}][{$field['id']}][level_id]" : "{$fields['id']}[{{row-count-placeholder}}][{$field['id']}]";
@@ -738,7 +741,10 @@  discard block
 block discarded – undo
738 741
 								</div>
739 742
 								<div class="give-row-body">
740 743
 									<?php foreach ( $fields['fields'] as $field ) : ?>
741
-										<?php if ( ! give_is_field_callback_exist( $field ) ) continue; ?>
744
+										<?php if ( ! give_is_field_callback_exist( $field ) ) {
745
+	continue;
746
+}
747
+?>
742 748
 										<?php
743 749
 										$field['repeat'] = true;
744 750
 										$field['repeatable_field_id'] = ( '_give_id' === $field['id'] ) ? "{$fields['id']}[{$index}][{$field['id']}][level_id]" : "{$fields['id']}[{$index}][{$field['id']}]";
@@ -765,7 +771,10 @@  discard block
 block discarded – undo
765 771
 							<div class="give-row-body">
766 772
 								<?php $index = 0; ?>
767 773
 								<?php foreach ( $fields['fields'] as $field ) : ?>
768
-									<?php if ( ! give_is_field_callback_exist( $field ) ) continue; ?>
774
+									<?php if ( ! give_is_field_callback_exist( $field ) ) {
775
+	continue;
776
+}
777
+?>
769 778
 									<?php
770 779
 									$field['repeat'] = true;
771 780
 									$field['repeatable_field_id'] = ( '_give_id' === $field['id'] ) ? "{$fields['id']}[{$index}][{$field['id']}][level_id]" : "{$fields['id']}[{$index}][{$field['id']}]";
Please login to merge, or discard this patch.