Completed
Push — develop ( b6d173...c20624 )
by
unknown
18:28
created
includes/admin/class-gravityview-admin-no-conflict.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 		// Dequeue other jQuery styles even if no-conflict is off.
124 124
 		// Terrible-looking tabs help no one.
125
-		if( !empty( $wp_styles->registered ) )  {
125
+		if( !empty( $wp_styles->registered ) ) {
126 126
 			foreach ($wp_styles->registered as $key => $style) {
127 127
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
128 128
 					wp_dequeue_style( $key );
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 
206 206
 		//unregistering scripts
207 207
 		$registered = array();
208
-		foreach( $wp_objects->registered as $handle => $script_registration ){
209
-			if( in_array( $handle, $required_objects ) || preg_match( $allow_regex, $handle ) ){
208
+		foreach( $wp_objects->registered as $handle => $script_registration ) {
209
+			if( in_array( $handle, $required_objects ) || preg_match( $allow_regex, $handle ) ) {
210 210
 				$registered[ $handle ] = $script_registration;
211 211
 			}
212 212
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 		}
127 127
 
128 128
 		// If doing ajax, get outta here.
129
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
129
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) ) {
130 130
 			return;
131 131
 		}
132 132
 
@@ -191,7 +191,8 @@  discard block
 block discarded – undo
191 191
 			if ( empty( $license_data ) ) {
192 192
 				if ( $is_ajax ) {
193 193
 					exit( json_encode( array() ) );
194
-				} else { // Non-ajax call
194
+				} else {
195
+// Non-ajax call
195 196
 					return json_encode( array() );
196 197
 				}
197 198
 			}
@@ -226,7 +227,8 @@  discard block
 block discarded – undo
226 227
 
227 228
 		if ( $is_ajax ) {
228 229
 			exit( $json );
229
-		} else { // Non-ajax call
230
+		} else {
231
+// Non-ajax call
230 232
 			return ( Utils::_GET( 'format', Utils::get( $data, 'format' ) ) === 'object' ) ? $license_data : $json;
231 233
 		}
232 234
 	}
Please login to merge, or discard this patch.
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.