Completed
Pull Request — develop (#1742)
by
unknown
18:03
created
future/includes/class-gv-extension.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@
 block discarded – undo
291 291
 	public function settings() {
292 292
 
293 293
 		// If doing ajax, get outta here.
294
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
294
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) ) {
295 295
 			return;
296 296
 		}
297 297
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 *
430 430
 	 * @return void
431 431
 	 */
432
-	public function add_custom_column_content( $column_name = null, $post_id = 0 )	{
432
+	public function add_custom_column_content( $column_name = null, $post_id = 0 ) {
433 433
 
434 434
 		$output = '';
435 435
 
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 	 */
599 599
 	function save_postdata( $post_id ) {
600 600
 
601
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
601
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
602 602
 			return;
603 603
 		}
604 604
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -716,7 +716,8 @@  discard block
 block discarded – undo
716 716
 
717 717
 							// Only allow quantity to be set if it's allowed to be edited
718 718
 							if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) {
719
-							} else { // otherwise set to what it previously was
719
+							} else {
720
+// otherwise set to what it previously was
720 721
 								$_POST[ $input_name ] = $entry[ $input['id'] ];
721 722
 							}
722 723
 						} else {
@@ -1180,7 +1181,7 @@  discard block
 block discarded – undo
1180 1181
 
1181 1182
 		$back_link = remove_query_arg( array( 'page', 'view', 'edit', 'gvid' ) );
1182 1183
 
1183
-		if( ! $this->is_valid ){
1184
+		if( ! $this->is_valid ) {
1184 1185
 
1185 1186
 			// Keeping this compatible with Gravity Forms.
1186 1187
 			$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
@@ -2473,9 +2474,7 @@  discard block
 block discarded – undo
2473 2474
 		// Verify
2474 2475
 		else if( ! $this->is_edit_entry() ) {
2475 2476
 			$valid = false;
2476
-		}
2477
-
2478
-		else {
2477
+		} else {
2479 2478
 			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
2480 2479
 		}
2481 2480
 
Please login to merge, or discard this patch.
includes/class-admin-installer.php 1 patch
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -498,9 +498,7 @@
 block discarded – undo
498 498
 			$button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license );
499 499
 			$button_class = 'button-primary button-large';
500 500
 			$href         = 'https://www.gravitykit.com/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
501
-		}
502
-
503
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
501
+		} elseif ( ! empty( $download_info['coming_soon'] ) ) {
504 502
 	        $spinner      = false;
505 503
 	        $status       = 'notinstalled';
506 504
 	        $status_label = __( 'Coming Soon', 'gravityview' );
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval-link.php 1 patch
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -467,9 +467,7 @@
 block discarded – undo
467 467
 
468 468
 			if ( 'success' === $result ) {
469 469
 				echo \GVCommon::generate_notice( __( 'Entry approval updated!', 'gravityview' ), 'gv-success' );
470
-			}
471
-
472
-			elseif ( 'error' === $result ) {
470
+			} elseif ( 'error' === $result ) {
473 471
 				echo \GVCommon::generate_notice( __( 'Error updating approval.', 'gravityview' ), 'gv-error' );
474 472
 			}
475 473
 		}
Please login to merge, or discard this patch.