Completed
Pull Request — master (#778)
by Zack
07:56 queued 03:54
created
includes/fields/class-gravityview-field-hidden.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	function edit_entry_fix_hidden_fields( $fields ) {
48 48
 
49 49
 		/** @var GF_Field $field */
50
-		foreach( $fields as &$field ) {
50
+		foreach ( $fields as &$field ) {
51 51
 			if ( 'hidden' === $field->type ) {
52 52
 
53 53
 				// Replace GF_Field_Hidden with GF_Field_Text, copying all the data from $field
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-custom-field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @return void
31 31
 	 */
32 32
 	private function add_hooks() {
33
-		add_filter( 'gravityview/edit_entry/field_value_post_custom_field', array( $this, 'edit_entry_field_value'), 10, 2 );
33
+		add_filter( 'gravityview/edit_entry/field_value_post_custom_field', array( $this, 'edit_entry_field_value' ), 10, 2 );
34 34
 	}
35 35
 
36 36
 	/**
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public function edit_entry_field_value( $field_value, $field ) {
47 47
 
48
-		if( 'list' === $field->inputType ) {
48
+		if ( 'list' === $field->inputType ) {
49 49
 			$field_value = is_string( $field_value ) ? json_decode( $field_value, true ) : $field_value;
50 50
 
51 51
 			if ( ! is_array( $field_value ) ) {
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-category.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 	var $name = 'post_category';
11 11
 
12
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
12
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
13 13
 
14 14
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
15 15
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 		$entry = GFAPI::get_entry( $entry_id );
43 43
 		$post_id = rgar( $entry, 'post_id' );
44 44
 
45
-		if( empty( $post_id ) ) {
45
+		if ( empty( $post_id ) ) {
46 46
 			return false;
47 47
 		}
48 48
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 		$post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' );
52 52
 
53
-		if( $post_category_fields ) {
53
+		if ( $post_category_fields ) {
54 54
 
55 55
 			$updated_categories = array();
56 56
 
@@ -117,18 +117,18 @@  discard block
 block discarded – undo
117 117
 	 *
118 118
 	 * @return mixed
119 119
 	 */
120
-	function edit_entry_post_category_choices( $choices, $field, $form_id  ) {
120
+	function edit_entry_post_category_choices( $choices, $field, $form_id ) {
121 121
 
122
-		$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
122
+		$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
123 123
 
124 124
 		// $entry['post_id'] should always be set, but we check to make sure.
125
-		if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) {
125
+		if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) {
126 126
 
127 127
 			$post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) );
128 128
 
129 129
 			// Always use the live value
130 130
 			foreach ( $choices as &$choice ) {
131
-				$choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) );
131
+				$choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) );
132 132
 			}
133 133
 		}
134 134
 
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
137 137
 
138 138
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
139 139
 
140
-		if( 'edit' === $context ) {
140
+		if ( 'edit' === $context ) {
141 141
 			return $field_options;
142 142
 		}
143 143
 
144
-		$this->add_field_support('dynamic_data', $field_options );
145
-		$this->add_field_support('link_to_term', $field_options );
144
+		$this->add_field_support( 'dynamic_data', $field_options );
145
+		$this->add_field_support( 'link_to_term', $field_options );
146 146
 
147 147
 		return $field_options;
148 148
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-checkbox.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 	var $name = 'checkbox';
11 11
 
12
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
12
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
13 13
 
14 14
 	var $_gf_field_class_name = 'GF_Field_Checkbox';
15 15
 
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
40 40
 
41 41
 		// It's not the parent field; it's an input
42
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
42
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
43 43
 
44
-			if( $this->is_choice_value_enabled() ) {
44
+			if ( $this->is_choice_value_enabled() ) {
45 45
 
46 46
 				$desc = esc_html__( 'This input has a label and a value. What should be displayed?', 'gravityview' );
47 47
 				$default = 'value';
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 				);
60 60
 			}
61 61
 
62
-			$field_options['choice_display'] = array(
62
+			$field_options[ 'choice_display' ] = array(
63 63
 				'type'    => 'radio',
64 64
 				'class'   => 'vertical',
65 65
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-ultimate-member.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	function parse_um_profile_post_content( $args = array() ) {
44 44
 		global $ultimatemember;
45 45
 
46
-		if( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
46
+		if ( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
47 47
 			return;
48 48
 		}
49 49
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 			return;
60 60
 		}
61 61
 
62
-		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[0]->post_content );
62
+		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[ 0 ]->post_content );
63 63
 
64 64
 		wp_reset_postdata();
65 65
 	}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-elegant-themes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 	 * Prevent Divi from adding their stuff to GV pages
35 35
 	 */
36 36
 	public function add_hooks_admin_init() {
37
-		if( GravityView_Admin::is_admin_page() ) {
37
+		if ( GravityView_Admin::is_admin_page() ) {
38 38
 			// Prevent Divi from adding import/export modal dialog
39 39
 			remove_action( 'admin_init', 'et_pb_register_builder_portabilities' );
40 40
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
14
-	do_action('gravityview_log_debug', 'search-field-select.php - No choices for field' );
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14
+	do_action( 'gravityview_log_debug', 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
21 21
  * @param string $default_option Default: `—` (—)
22 22
  * @param string $field_type Field type: "select" or "multiselect"
23 23
  */
24
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
24
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
25 25
 
26 26
 ?>
27 27
 <div class="gv-search-box gv-search-field-select">
28
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
29
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
28
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
29
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
30 30
 	<?php } ?>
31 31
 	<p>
32
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
33
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
32
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
33
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
34 34
 			<?php
35
-			foreach( $search_field['choices'] as $choice ) : ?>
36
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
35
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
36
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
37 37
 			<?php endforeach; ?>
38 38
 		</select>
39 39
 	</p>
Please login to merge, or discard this patch.
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -38,13 +38,13 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
45 45
 		$view_data = GravityView_View_Data::getInstance()->get_views();
46 46
 
47
-		if( empty( $view_data ) ) {
47
+		if ( empty( $view_data ) ) {
48 48
 			return;
49 49
 		}
50 50
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 				'parent' => 'gravityview',
105 105
 				'title' => __( 'Edit Entry', 'gravityview' ),
106 106
 				'meta' => array(
107
-					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry['id'], $entry ) ),
107
+					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ) ),
108 108
 				),
109
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
109
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
110 110
 			) );
111 111
 
112 112
 		}
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 		/** @var WP_Admin_Bar $wp_admin_bar */
123 123
 		global $wp_admin_bar;
124 124
 
125
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
125
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
126 126
 
127 127
 			$view_data = GravityView_View_Data::getInstance();
128 128
 
@@ -139,32 +139,32 @@  discard block
 block discarded – undo
139 139
 					$edit_view_title = __( 'Edit View', 'gravityview' );
140 140
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
141 141
 
142
-					if( sizeof( $views ) > 1 ) {
143
-						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view['id'] );
144
-						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $view['form_id'] );
142
+					if ( sizeof( $views ) > 1 ) {
143
+						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view[ 'id' ] );
144
+						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $view[ 'form_id' ] );
145 145
 					}
146 146
 
147
-					if( GVCommon::has_cap( 'edit_gravityview', $view['id'] ) && ! in_array( $view['id'], $added_views ) ) {
147
+					if ( GVCommon::has_cap( 'edit_gravityview', $view[ 'id' ] ) && ! in_array( $view[ 'id' ], $added_views ) ) {
148 148
 
149
-						$added_views[] = $view['id'];
149
+						$added_views[ ] = $view[ 'id' ];
150 150
 
151 151
 						$wp_admin_bar->add_menu( array(
152
-							'id'    => 'edit-view-' . $view['id'],
152
+							'id'    => 'edit-view-' . $view[ 'id' ],
153 153
 							'parent' => 'gravityview',
154 154
 							'title' => $edit_view_title,
155
-							'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view['id'] ) ) ),
155
+							'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view[ 'id' ] ) ) ),
156 156
 						) );
157 157
 					}
158 158
 
159
-					if ( ! empty( $view['form_id'] ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $view['form_id'] ) && ! in_array( $view['form_id'], $added_forms )  ) {
159
+					if ( ! empty( $view[ 'form_id' ] ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $view[ 'form_id' ] ) && ! in_array( $view[ 'form_id' ], $added_forms ) ) {
160 160
 
161
-						$added_forms[] = $view['form_id'];
161
+						$added_forms[ ] = $view[ 'form_id' ];
162 162
 
163 163
 						$wp_admin_bar->add_menu( array(
164
-							'id'    => 'edit-form-' . $view['form_id'],
164
+							'id'    => 'edit-form-' . $view[ 'form_id' ],
165 165
 							'parent' => 'gravityview',
166 166
 							'title' => $edit_form_title,
167
-							'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $view['form_id'] ) ) ),
167
+							'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $view[ 'form_id' ] ) ) ),
168 168
 						) );
169 169
 					}
170 170
 				}
Please login to merge, or discard this patch.
includes/admin/field-types/type_multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 
@@ -20,13 +20,13 @@  discard block
 block discarded – undo
20 20
 	}
21 21
 
22 22
 	function render_input( $override_input = null ) {
23
-		if( isset( $override_input ) ) {
23
+		if ( isset( $override_input ) ) {
24 24
 			echo $override_input;
25 25
 			return;
26 26
 		}
27 27
 		?>
28 28
 		<select name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>">
29
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
29
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
30 30
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $this->value, true ); ?>><?php echo esc_html( $label ); ?></option>
31 31
 			<?php endforeach; ?>
32 32
 		</select>
Please login to merge, or discard this patch.