Completed
Pull Request — master (#1147)
by Gennady
22:01 queued 16:50
created
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
40 40
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
41 41
 
42 42
 		if ( 'date_created' === $source_field ) {
43
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
44
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
43
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
44
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
45 45
 		}
46 46
 
47 47
 		if ( in_array( $operation, array( 'in', 'not_in' ) ) ) {
48
-			return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $operation );
48
+			return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $operation );
49 49
 		}
50 50
 
51 51
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
@@ -69,18 +69,18 @@  discard block
 block discarded – undo
69 69
 
70 70
         $post_data = self::get_post_fields( $form, $entry );
71 71
 
72
-        $media = get_attached_media( 'image', $entry['post_id'] );
72
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
73 73
 
74 74
         $post_images = array();
75 75
 
76 76
         foreach ( $media as $media_item ) {
77
-            foreach( (array) $post_data['images'] as $post_data_item ) {
78
-                if(
77
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
78
+                if (
79 79
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
80 80
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
81 81
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
82 82
                 ) {
83
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
83
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
84 84
                 }
85 85
             }
86 86
         }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
          * If the method changes to public, use Gravity Forms' method
109 109
          * @todo: If/when the method is public, remove the unneeded copied code.
110 110
          */
111
-        if( $reflection->isPublic() ) {
111
+        if ( $reflection->isPublic() ) {
112 112
             return parent::get_post_fields( $form, $entry );
113 113
         }
114 114
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
          * If the method changes to public, use Gravity Forms' method
136 136
          * @todo: If/when the method is public, remove the unneeded copied code.
137 137
          */
138
-        if( $reflection->isPublic() ) {
138
+        if ( $reflection->isPublic() ) {
139 139
             return parent::copy_post_image( $url, $post_id );
140 140
         }
141 141
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
          * If the method changes to public, use Gravity Forms' method
171 171
          * @todo: If/when the method is public, remove the unneeded copied code.
172 172
          */
173
-        if( $reflection->isPublic() ) {
173
+        if ( $reflection->isPublic() ) {
174 174
             return parent::media_handle_upload( $url, $post_id, $post_data );
175 175
         }
176 176
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 
25 25
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 			$base_id = null;
120 120
 
121 121
 			$is_single = gravityview_get_context() === 'single';
122
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
122
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
123 123
 			$field_compat = $gravityview_view->getCurrentField();
124 124
 		}
125 125
 
126 126
 		$output_arr = array();
127 127
 
128 128
 		// Get an array of file paths for the field.
129
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
129
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
130 130
 
131 131
 		// The $value JSON was probably truncated; let's check lead_detail_long.
132 132
 		if ( ! is_array( $file_paths ) ) {
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			$text = $rendered = null;
146 146
 
147 147
 			// If the site is HTTPS, use HTTPS
148
-			if ( function_exists('set_url_scheme') ) {
148
+			if ( function_exists( 'set_url_scheme' ) ) {
149 149
 				$file_path = set_url_scheme( $file_path );
150 150
 			}
151 151
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 			$file_path_info = pathinfo( $file_path );
169 169
 
170 170
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
171
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
171
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
172 172
 
173 173
 			// Audio
174 174
 			if ( in_array( $extension, wp_get_audio_extensions() ) ) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 					 */
183 183
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
184 184
 						'src' => $file_path,
185
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
185
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
186 186
 					), $context );
187 187
 
188 188
 					/**
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 					 */
207 207
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
208 208
 						'src' => $file_path,
209
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
209
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
210 210
 					), $context );
211 211
 
212 212
 					/**
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
 			} else if ( in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ) ) {
227 227
 				$image_atts = array(
228 228
 					'src' => $file_path,
229
-					'class' => 'gv-image gv-field-id-'.$field_settings['id'],
230
-					'alt' => $field_settings['label'],
229
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
230
+					'alt' => $field_settings[ 'label' ],
231 231
 					'width' => ( $is_single ? NULL : 250 )
232 232
 				);
233 233
 
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
 
242 242
 				$image = new GravityView_Image( $image_atts );
243 243
 
244
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
244
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
245 245
 
246 246
 				$text = $image->html();
247 247
 
248
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
248
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
249 249
 					$lightbox_link_atts = array(
250 250
 						'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
251 251
 						'class' => 'thickbox',
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
270 270
 
271 271
 			// Output textualized content where 
272
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) && empty( $field_settings['show_as_link'] ) ) ) {
273
-				$content = empty( $text ) ? $file_path_info['basename'] : $text;
272
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) && empty( $field_settings[ 'show_as_link' ] ) ) ) {
273
+				$content = empty( $text ) ? $file_path_info[ 'basename' ] : $text;
274 274
 
275 275
 				/**
276 276
 				 * Modify the link text (defaults to the file name)
@@ -295,10 +295,10 @@  discard block
 block discarded – undo
295 295
 
296 296
 				$content = gravityview_get_link( $file_path, $content, $link_atts );
297 297
 			} else {
298
-				$content = empty( $rendered ) ? ( empty( $text ) ? $file_path_info['basename'] : $text ) : $rendered;
298
+				$content = empty( $rendered ) ? ( empty( $text ) ? $file_path_info[ 'basename' ] : $text ) : $rendered;
299 299
 			}
300 300
 
301
-			$output_arr[] = array(
301
+			$output_arr[ ] = array(
302 302
 				'file_path' => $file_path,
303 303
 				'content' => $content
304 304
 			);
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$form = false;
127 127
 
128
-		if( $entry ) {
129
-			$form = GFAPI::get_form( $entry['form_id'] );
128
+		if ( $entry ) {
129
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
130 130
 		}
131 131
 
132 132
 		return $form;
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
 
193 193
 			$has_transaction_data = \GV\Utils::get( $entry, $meta, false );
194 194
 
195
-			if( ! empty( $has_transaction_data ) ) {
195
+			if ( ! empty( $has_transaction_data ) ) {
196 196
 				break;
197 197
 			}
198 198
 		}
199 199
 
200
-		return (bool) $has_transaction_data;
200
+		return (bool)$has_transaction_data;
201 201
 	}
202 202
 
203 203
 	/**
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 
236 236
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
237 237
 
238
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
238
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
239 239
 
240 240
 		return $result;
241 241
 	}
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
 	 *
253 253
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
254 254
 	 */
255
-	public static function get_forms(  $active = true, $trash = false ) {
255
+	public static function get_forms( $active = true, $trash = false ) {
256 256
 		$forms = array();
257 257
 		if ( class_exists( 'GFAPI' ) ) {
258
-			if( 'any' === $active ) {
258
+			if ( 'any' === $active ) {
259 259
 				$active_forms = GFAPI::get_forms( true, $trash );
260 260
 				$inactive_forms = GFAPI::get_forms( false, $trash );
261 261
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -286,9 +286,9 @@  discard block
 block discarded – undo
286 286
 		$has_post_fields = false;
287 287
 
288 288
 		if ( $form ) {
289
-			foreach ( $form['fields'] as $field ) {
290
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
291
-					$fields["{$field['id']}"] = array(
289
+			foreach ( $form[ 'fields' ] as $field ) {
290
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
291
+					$fields[ "{$field[ 'id' ]}" ] = array(
292 292
 						'label' => \GV\Utils::get( $field, 'label' ),
293 293
 						'parent' => null,
294 294
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -297,10 +297,10 @@  discard block
 block discarded – undo
297 297
 					);
298 298
 				}
299 299
 
300
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
301
-					foreach ( $field['inputs'] as $input ) {
300
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
301
+					foreach ( $field[ 'inputs' ] as $input ) {
302 302
 
303
-						if( ! empty( $input['isHidden'] ) ) {
303
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
304 304
 							continue;
305 305
 						}
306 306
 
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
308 308
                          * @hack
309 309
                          * In case of email/email confirmation, the input for email has the same id as the parent field
310 310
                          */
311
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
311
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
312 312
                             continue;
313 313
                         }
314
-						$fields["{$input['id']}"] = array(
314
+						$fields[ "{$input[ 'id' ]}" ] = array(
315 315
 							'label' => \GV\Utils::get( $input, 'label' ),
316 316
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
317 317
 							'parent' => $field,
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 				}
324 324
 
325 325
 
326
-				if( GFCommon::is_product_field( $field['type'] ) ){
326
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
327 327
 					$has_product_fields = true;
328 328
 				}
329 329
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 		 * @since 1.7
338 338
 		 */
339 339
 		if ( $has_post_fields ) {
340
-			$fields['post_id'] = array(
340
+			$fields[ 'post_id' ] = array(
341 341
 				'label' => __( 'Post ID', 'gravityview' ),
342 342
 				'type' => 'post_id',
343 343
 			);
@@ -350,11 +350,11 @@  discard block
 block discarded – undo
350 350
 			foreach ( $payment_fields as $payment_field ) {
351 351
 
352 352
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
353
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
353
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
354 354
 					continue;
355 355
 				}
356 356
 
357
-				$fields["{$payment_field->name}"] = array(
357
+				$fields[ "{$payment_field->name}" ] = array(
358 358
 					'label' => $payment_field->label,
359 359
 					'desc' => $payment_field->description,
360 360
 					'type' => $payment_field->name,
@@ -386,9 +386,9 @@  discard block
 block discarded – undo
386 386
 
387 387
 		$fields = array();
388 388
 
389
-		foreach ( $extra_fields as $key => $field ){
390
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
391
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
389
+		foreach ( $extra_fields as $key => $field ) {
390
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
391
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
392 392
 			}
393 393
 		}
394 394
 
@@ -428,33 +428,33 @@  discard block
 block discarded – undo
428 428
 			'search_criteria' => null,
429 429
 			'sorting' => null,
430 430
 			'paging' => null,
431
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
431
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
432 432
 			'context_view_id' => null,
433 433
 		);
434 434
 
435 435
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
436 436
 
437
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
438
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
437
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
438
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
439 439
 
440 440
 				if ( ! is_array( $filter ) ) {
441 441
 					continue;
442 442
 				}
443 443
 
444 444
 				// By default, we want searches to be wildcard for each field.
445
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
445
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
446 446
 
447 447
 				/**
448 448
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
449 449
 				 * @param string $operator Existing search operator
450 450
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
451 451
 				 */
452
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
452
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
453 453
 			}
454 454
 
455 455
 			// don't send just the [mode] without any field filter.
456
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
457
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
456
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
457
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
458 458
 			}
459 459
 
460 460
 		}
@@ -465,33 +465,33 @@  discard block
 block discarded – undo
465 465
 		 * Prepare date formats to be in Gravity Forms DB format;
466 466
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
467 467
 		 */
468
-		foreach ( array('start_date', 'end_date' ) as $key ) {
468
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
469 469
 
470
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
470
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
471 471
 
472 472
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
473
-				$date = date_create( $criteria['search_criteria'][ $key ] );
473
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
474 474
 
475 475
 				if ( $date ) {
476 476
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
477
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
477
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
478 478
 				} else {
479
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
479
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
480 480
 
481 481
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
482
-					unset( $criteria['search_criteria'][ $key ] );
482
+					unset( $criteria[ 'search_criteria' ][ $key ] );
483 483
 				}
484 484
 			}
485 485
 		}
486 486
 
487
-		if ( empty( $criteria['context_view_id'] ) ) {
487
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
488 488
 			// Calculate the context view id and send it to the advanced filter
489 489
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
490
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
490
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
491 491
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
492
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
492
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
493 493
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
494
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
494
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
495 495
 			}
496 496
 		}
497 497
 
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 		 * @param array $form_ids Forms to search
502 502
 		 * @param int $view_id ID of the view being used to search
503 503
 		 */
504
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
504
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
505 505
 
506 506
 		return (array)$criteria;
507 507
 	}
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 		/** Reduce # of database calls */
537 537
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
538 538
 
539
-		if ( ! empty( $criteria['cache'] ) ) {
539
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
540 540
 
541 541
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
542 542
 
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 
545 545
 				// Still update the total count when using cached results
546 546
 				if ( ! is_null( $total ) ) {
547
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
547
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
548 548
 				}
549 549
 
550 550
 				$return = $entries;
@@ -566,9 +566,9 @@  discard block
 block discarded – undo
566 566
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
567 567
 
568 568
 			// No entries returned from gravityview_before_get_entries
569
-			if( is_null( $entries ) ) {
569
+			if ( is_null( $entries ) ) {
570 570
 
571
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
571
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
572 572
 
573 573
 				if ( is_wp_error( $entries ) ) {
574 574
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
 				}
580 580
 			}
581 581
 
582
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
582
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
583 583
 
584 584
 				// Cache results
585 585
 				$Cache->set( $entries, 'entries' );
@@ -688,12 +688,12 @@  discard block
 block discarded – undo
688 688
 		 */
689 689
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
690 690
 
691
-		if( $check_entry_display ) {
691
+		if ( $check_entry_display ) {
692 692
 			// Is the entry allowed
693 693
 			$entry = self::check_entry_display( $entry );
694 694
 		}
695 695
 
696
-		if( is_wp_error( $entry ) ) {
696
+		if ( is_wp_error( $entry ) ) {
697 697
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
698 698
 			return false;
699 699
 		}
@@ -727,12 +727,12 @@  discard block
 block discarded – undo
727 727
 
728 728
 		$value = false;
729 729
 
730
-		if( 'context' === $val1 ) {
730
+		if ( 'context' === $val1 ) {
731 731
 
732 732
 			$matching_contexts = array( $val2 );
733 733
 
734 734
 			// We allow for non-standard contexts.
735
-			switch( $val2 ) {
735
+			switch ( $val2 ) {
736 736
 				// Check for either single or edit
737 737
 				case 'singular':
738 738
 					$matching_contexts = array( 'single', 'edit' );
@@ -775,18 +775,18 @@  discard block
 block discarded – undo
775 775
 				$json_val_1 = json_decode( $val1, true );
776 776
 				$json_val_2 = json_decode( $val2, true );
777 777
 
778
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
778
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
779 779
 
780 780
 					$json_in = false;
781
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
782
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
781
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
782
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
783 783
 
784 784
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
785 785
 					foreach ( $json_val_1 as $item_1 ) {
786 786
 						foreach ( $json_val_2 as $item_2 ) {
787 787
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
788 788
 
789
-							if( $json_in ) {
789
+							if ( $json_in ) {
790 790
 								break 2;
791 791
 							}
792 792
 						}
@@ -838,10 +838,10 @@  discard block
 block discarded – undo
838 838
 	public static function check_entry_display( $entry, $view = null ) {
839 839
 
840 840
 		if ( ! $entry || is_wp_error( $entry ) ) {
841
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
841
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
842 842
 		}
843 843
 
844
-		if ( empty( $entry['form_id'] ) ) {
844
+		if ( empty( $entry[ 'form_id' ] ) ) {
845 845
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
846 846
 		}
847 847
 
@@ -849,55 +849,55 @@  discard block
 block discarded – undo
849 849
 			'context_view_id' => $view ? $view->ID : null,
850 850
 		) );
851 851
 
852
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
852
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
853 853
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) );
854 854
 			return $entry;
855 855
 		}
856 856
 
857 857
 		// Make sure the current View is connected to the same form as the Entry
858
-		if( ! empty( $criteria['context_view_id'] ) ) {
859
-			$context_view_id = intval( $criteria['context_view_id'] );
858
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
859
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
860 860
 			$context_form_id = gravityview_get_form_id( $context_view_id );
861
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
862
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
861
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
862
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
863 863
 			}
864 864
 		}
865 865
 
866
-		$search_criteria = $criteria['search_criteria'];
866
+		$search_criteria = $criteria[ 'search_criteria' ];
867 867
 
868 868
 		// check entry status
869
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
870
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
869
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
870
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
871 871
 		}
872 872
 
873 873
 		// check entry date
874 874
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
875 875
 
876 876
 		// field_filters
877
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
877
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
878 878
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) );
879 879
 			return $entry;
880 880
 		}
881 881
 
882
-		$filters = $search_criteria['field_filters'];
882
+		$filters = $search_criteria[ 'field_filters' ];
883 883
 
884
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
884
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
885 885
 
886
-		$mode = $mode ? : 'all'; // If mode is an empty string, assume it's 'all'
886
+		$mode = $mode ?: 'all'; // If mode is an empty string, assume it's 'all'
887 887
 
888 888
 		// Prevent the mode from being processed below
889
-		unset( $filters['mode'] );
889
+		unset( $filters[ 'mode' ] );
890 890
 
891
-		$form = self::get_form( $entry['form_id'] );
891
+		$form = self::get_form( $entry[ 'form_id' ] );
892 892
 
893 893
 		foreach ( $filters as $filter ) {
894 894
 
895
-			if ( ! isset( $filter['key'] ) ) {
895
+			if ( ! isset( $filter[ 'key' ] ) ) {
896 896
 				gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set: {filter}', array( 'filter' => $filter ) );
897 897
 				continue;
898 898
 			}
899 899
 
900
-			$k = $filter['key'];
900
+			$k = $filter[ 'key' ];
901 901
 
902 902
 			$field = self::get_field( $form, $k );
903 903
 
@@ -905,14 +905,14 @@  discard block
 block discarded – undo
905 905
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
906 906
 				$field = $k;
907 907
 			} else {
908
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
908
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
909 909
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
910 910
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value;
911 911
 			}
912 912
 
913
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
913
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
914 914
 
915
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
915
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
916 916
 
917 917
 			// Any match is all we need to know
918 918
 			if ( $is_value_match && 'any' === $mode ) {
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
 
922 922
 			// Any failed match is a total fail
923 923
 			if ( ! $is_value_match && 'all' === $mode ) {
924
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
924
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
925 925
 			}
926 926
 		}
927 927
 
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' );
932 932
 			return $entry;
933 933
 		} else {
934
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
934
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
935 935
 		}
936 936
 
937 937
 	}
@@ -972,18 +972,18 @@  discard block
 block discarded – undo
972 972
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
973 973
 		 * @see GFCommon::format_date() for original code
974 974
 		 */
975
-		$date_gmt_time   = mysql2date( 'G', $date_string );
975
+		$date_gmt_time = mysql2date( 'G', $date_string );
976 976
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
977 977
 
978
-		$format  = \GV\Utils::get( $atts, 'format' );
979
-		$is_human  = ! empty( $atts['human'] );
980
-		$is_diff  = ! empty( $atts['diff'] );
981
-		$is_raw = ! empty( $atts['raw'] );
982
-		$is_timestamp = ! empty( $atts['timestamp'] );
983
-		$include_time = ! empty( $atts['time'] );
978
+		$format = \GV\Utils::get( $atts, 'format' );
979
+		$is_human = ! empty( $atts[ 'human' ] );
980
+		$is_diff = ! empty( $atts[ 'diff' ] );
981
+		$is_raw = ! empty( $atts[ 'raw' ] );
982
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
983
+		$include_time = ! empty( $atts[ 'time' ] );
984 984
 
985 985
 		// If we're using time diff, we want to have a different default format
986
-		if( empty( $format ) ) {
986
+		if ( empty( $format ) ) {
987 987
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
988 988
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
989 989
 		}
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
 		// If raw was specified, don't modify the stored value
992 992
 		if ( $is_raw ) {
993 993
 			$formatted_date = $date_string;
994
-		} elseif( $is_timestamp ) {
994
+		} elseif ( $is_timestamp ) {
995 995
 			$formatted_date = $date_local_timestamp;
996 996
 		} elseif ( $is_diff ) {
997 997
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 
1026 1026
 		$label = \GV\Utils::get( $field, 'label' );
1027 1027
 
1028
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1028
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1029 1029
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1030 1030
 		}
1031 1031
 
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
1053 1053
 			$form = GFAPI::get_form( $form );
1054 1054
 		}
1055 1055
 
1056
-		if ( class_exists( 'GFFormsModel' ) ){
1056
+		if ( class_exists( 'GFFormsModel' ) ) {
1057 1057
 			return GFFormsModel::get_field( $form, $field_id );
1058 1058
 		} else {
1059 1059
 			return null;
@@ -1100,19 +1100,19 @@  discard block
 block discarded – undo
1100 1100
 			$shortcodes = array();
1101 1101
 
1102 1102
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1103
-			if ( empty( $matches ) ){
1103
+			if ( empty( $matches ) ) {
1104 1104
 				return false;
1105 1105
 			}
1106 1106
 
1107 1107
 			foreach ( $matches as $shortcode ) {
1108
-				if ( $tag === $shortcode[2] ) {
1108
+				if ( $tag === $shortcode[ 2 ] ) {
1109 1109
 
1110 1110
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1111
-					$shortcodes[] = $shortcode;
1111
+					$shortcodes[ ] = $shortcode;
1112 1112
 
1113
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1114
-					foreach( $results as $result ) {
1115
-						$shortcodes[] = $result;
1113
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1114
+					foreach ( $results as $result ) {
1115
+						$shortcodes[ ] = $result;
1116 1116
 					}
1117 1117
 				}
1118 1118
 			}
@@ -1144,7 +1144,7 @@  discard block
 block discarded – undo
1144 1144
 			'post_type'      => 'gravityview',
1145 1145
 			'posts_per_page' => 100,
1146 1146
 			'meta_key'       => '_gravityview_form_id',
1147
-			'meta_value'     => (int) $form_id,
1147
+			'meta_value'     => (int)$form_id,
1148 1148
 		);
1149 1149
 		$args     = wp_parse_args( $args, $defaults );
1150 1150
 		$views    = get_posts( $args );
@@ -1156,21 +1156,21 @@  discard block
 block discarded – undo
1156 1156
 
1157 1157
 			$data = unserialize( $view->meta_value );
1158 1158
 
1159
-			if( ! $data || ! is_array( $data ) ) {
1159
+			if ( ! $data || ! is_array( $data ) ) {
1160 1160
 				continue;
1161 1161
 			}
1162 1162
 
1163 1163
 			foreach ( $data as $datum ) {
1164
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
1165
-					$joined_forms[] = $view->post_id;
1164
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
1165
+					$joined_forms[ ] = $view->post_id;
1166 1166
 				}
1167 1167
 			}
1168 1168
 		}
1169 1169
 
1170 1170
 		if ( $joined_forms ) {
1171
-			$joined_args  = array(
1171
+			$joined_args = array(
1172 1172
 				'post_type'      => 'gravityview',
1173
-				'posts_per_page' => $args['posts_per_page'],
1173
+				'posts_per_page' => $args[ 'posts_per_page' ],
1174 1174
 				'post__in'       => $joined_forms,
1175 1175
 			);
1176 1176
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1326,7 +1326,7 @@  discard block
 block discarded – undo
1326 1326
 
1327 1327
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1328 1328
 
1329
-		if( $json_decode ) {
1329
+		if ( $json_decode ) {
1330 1330
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1331 1331
 		}
1332 1332
 
@@ -1342,7 +1342,7 @@  discard block
 block discarded – undo
1342 1342
 	 * @return string         html
1343 1343
 	 */
1344 1344
 	public static function get_sortable_fields( $formid, $current = '' ) {
1345
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
1345
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
1346 1346
 
1347 1347
 		if ( empty( $formid ) ) {
1348 1348
 			return $output;
@@ -1355,11 +1355,11 @@  discard block
 block discarded – undo
1355 1355
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1356 1356
 
1357 1357
 			foreach ( $fields as $id => $field ) {
1358
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1358
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1359 1359
 					continue;
1360 1360
 				}
1361 1361
 
1362
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1362
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1363 1363
 			}
1364 1364
 		}
1365 1365
 
@@ -1394,9 +1394,9 @@  discard block
 block discarded – undo
1394 1394
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1395 1395
 
1396 1396
 		// TODO: Convert to using array_filter
1397
-		foreach( $fields as $id => $field ) {
1397
+		foreach ( $fields as $id => $field ) {
1398 1398
 
1399
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1399
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1400 1400
 				unset( $fields[ $id ] );
1401 1401
 			}
1402 1402
 		}
@@ -1437,14 +1437,14 @@  discard block
 block discarded – undo
1437 1437
 	 * @param  int|array  $field field key or field array
1438 1438
 	 * @return boolean
1439 1439
 	 */
1440
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1440
+	public static function is_field_numeric( $form = null, $field = '' ) {
1441 1441
 
1442 1442
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1443 1443
 			$form = self::get_form( $form );
1444 1444
 		}
1445 1445
 
1446 1446
 		// If entry meta, it's a string. Otherwise, numeric
1447
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1447
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1448 1448
 			$type = $field;
1449 1449
 		} else {
1450 1450
 			$type = self::get_field_type( $form, $field );
@@ -1458,9 +1458,9 @@  discard block
 block discarded – undo
1458 1458
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1459 1459
 
1460 1460
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1461
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1462
-			if( true === $gv_field->is_numeric ) {
1463
-				$numeric_types[] = $gv_field->is_numeric;
1461
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1462
+			if ( true === $gv_field->is_numeric ) {
1463
+				$numeric_types[ ] = $gv_field->is_numeric;
1464 1464
 			}
1465 1465
 		}
1466 1466
 
@@ -1610,18 +1610,18 @@  discard block
 block discarded – undo
1610 1610
 		$final_atts = array_filter( $final_atts );
1611 1611
 
1612 1612
 		// If the href wasn't passed as an attribute, use the value passed to the function
1613
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1614
-			$final_atts['href'] = $href;
1613
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1614
+			$final_atts[ 'href' ] = $href;
1615 1615
 		}
1616 1616
 
1617
-		$final_atts['href'] = esc_url_raw( $href );
1617
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1618 1618
 
1619 1619
 		/**
1620 1620
 		 * Fix potential security issue with target=_blank
1621 1621
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1622 1622
 		 */
1623
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1624
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1623
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1624
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1625 1625
 		}
1626 1626
 
1627 1627
 		// Sort the attributes alphabetically, to help testing
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
1633 1633
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1634 1634
 		}
1635 1635
 
1636
-		if( '' !== $output ) {
1636
+		if ( '' !== $output ) {
1637 1637
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1638 1638
 		}
1639 1639
 
@@ -1660,7 +1660,7 @@  discard block
 block discarded – undo
1660 1660
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1661 1661
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1662 1662
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1663
-				$merged[] = $value;
1663
+				$merged[ ] = $value;
1664 1664
 			} else {
1665 1665
 				$merged[ $key ] = $value;
1666 1666
 			}
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1694 1694
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1695 1695
 		 */
1696
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1696
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1697 1697
 
1698 1698
 		return get_users( $get_users_settings );
1699 1699
 	}
@@ -1713,11 +1713,11 @@  discard block
 block discarded – undo
1713 1713
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1714 1714
 
1715 1715
     	// If $cap is defined, only show notice if user has capability
1716
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1716
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1717 1717
     		return '';
1718 1718
 	    }
1719 1719
 
1720
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1720
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1721 1721
     }
1722 1722
 
1723 1723
 	/**
Please login to merge, or discard this patch.