Completed
Push — develop ( 31c9ca...168da6 )
by Zack
38:08 queued 17:59
created
includes/widgets/class-gravityview-widget-page-links.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,35 +11,35 @@  discard block
 block discarded – undo
11 11
 
12 12
 	function __construct() {
13 13
 
14
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
14
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
15 15
 
16 16
 		$default_values = array( 'header' => 1, 'footer' => 1 );
17 17
 		$settings = array( 'show_all' => array(
18 18
 			'type' => 'checkbox',
19 19
 			'label' => __( 'Show each page number', 'gravityview' ),
20
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
20
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
21 21
 			'value' => false
22
-		));
23
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
22
+		) );
23
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
24 24
 
25 25
 	}
26 26
 
27
-	public function render_frontend( $widget_args, $content = '', $context = '') {
27
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
28 28
 		$gravityview_view = GravityView_View::getInstance();
29 29
 
30
-		if( !$this->pre_render_frontend() ) {
30
+		if ( ! $this->pre_render_frontend() ) {
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		$atts = shortcode_atts( array(
35 35
 			'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
36 36
 			'total' => $gravityview_view->total_entries,
37
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
38
-			'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
37
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
38
+			'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
39 39
 		), $widget_args, 'gravityview_widget_page_links' );
40 40
 		
41 41
 		$page_link_args = array(
42
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
42
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
43 43
 			'format' => '&pagenum=%#%',
44 44
 			'add_args' => array(), //
45 45
 			'prev_text' => '«',
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 			'type' => 'list',
48 48
 			'end_size' => 1,
49 49
 			'mid_size' => 2,
50
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
51
-			'current' => $atts['current'],
52
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
50
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
51
+			'current' => $atts[ 'current' ],
52
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
53 53
 		);
54 54
 
55 55
 		/**
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
 		 * @since 1.1.4
58 58
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
59 59
 		 */
60
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
60
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
61 61
 
62 62
 		$page_links = paginate_links( $page_link_args );
63 63
 
64
-		if( !empty( $page_links )) {
65
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
64
+		if ( ! empty( $page_links ) ) {
65
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
66 66
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
67
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
67
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
68 68
 		} else {
69 69
 			gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
70 70
 		}
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-link.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,12 +13,12 @@  discard block
 block discarded – undo
13 13
 $base_url = GravityView_Widget_Search::get_search_form_action();
14 14
 
15 15
 // Make sure that there are choices to display
16
-if ( empty( $search_field['choices'] ) ) {
16
+if ( empty( $search_field[ 'choices' ] ) ) {
17 17
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
18 18
 	return;
19 19
 }
20 20
 
21
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
21
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
22 22
 
23 23
 /**
24 24
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@  discard block
 block discarded – undo
41 41
 
42 42
         <?php
43 43
 
44
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
44
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
45 45
 
46
-        foreach ( $search_field['choices'] as $k => $choice ) {
46
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
47 47
 
48 48
             if ( 0 != $k ) {
49 49
                 echo esc_html( $links_sep );
50 50
             }
51 51
 
52
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
52
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
53 53
 
54 54
             if ( $active ) {
55
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
55
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
56 56
             } else {
57
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
57
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
58 58
             }
59 59
             ?>
60 60
 
61
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
61
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
62 62
 
63 63
 		<?php } ?>
64 64
 	</p>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-checkbox.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 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'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box gv-search-field-checkbox">
20
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
20
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
21
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22 22
 	<?php } ?>
23 23
 	<p>
24
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
24
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25 25
 
26
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
28
-			<?php echo esc_html( $choice['text'] ); ?>
26
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
27
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
28
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
29 29
 		</label>
30 30
 
31 31
 	<?php } ?>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-radio.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 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'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-radio.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box gv-search-field-radio">
20
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
20
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
21
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22 22
 	<?php } ?>
23 23
 	<p>
24
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
24
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25 25
 
26
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27
-			<input type="radio" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php checked( $choice['value'], $search_field['value'], true ); ?>>
28
-			<?php echo esc_html( $choice['text'] ); ?>
26
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
27
+			<input type="radio" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php checked( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>>
28
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
29 29
 		</label>
30 30
 
31 31
 	<?php } ?>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-multiselect.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  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'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-multiselect.php - No choices for field' );
15 15
 	return;
16 16
 }
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
21 21
  * @param string $default_option Default: `&mdash;` (—)
22 22
  * @param string $field_type Field type: "select" or "multiselect"
23 23
  */
24
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'multiselect' );
24
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'multiselect' );
25 25
 
26 26
 ?>
27 27
 <div class="gv-search-box gv-search-field-multiselect">
28
-	<?php if( ! gv_empty( $search_field['label'], false, 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, 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'] ); ?>" multiple>
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' ] ); ?>" multiple>
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( $choice['value'], $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( $choice[ 'value' ], $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/admin/field-types/type_text.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
 			echo $this->get_tooltip() . $this->get_field_desc();
13 13
 		?><div>
14 14
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 	function render_input( $override_input = null ) {
21 21
 
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33 33
         }
34 34
         $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-metabox-tab.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param array $callback_args Arguments passed to the callback
98 98
 	 * @return void
99 99
 	 */
100
-	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
100
+	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array() ) {
101 101
 
102
-		$this->id = $this->prefix.$id;
102
+		$this->id = $this->prefix . $id;
103 103
 		$this->title = $title;
104 104
 		$this->render_template_file = $file;
105 105
 		$this->callback = $callback;
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	function parse_icon_class_name( $icon_class_name = '' ) {
120 120
 
121
-		if( preg_match( '/dashicon/i', $icon_class_name ) ) {
121
+		if ( preg_match( '/dashicon/i', $icon_class_name ) ) {
122 122
 			$icon_class_name = 'dashicons ' . $icon_class_name;
123 123
 		}
124 124
 
@@ -142,29 +142,29 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function render( $post ) {
144 144
 
145
-		if( !empty( $this->render_template_file ) ) {
145
+		if ( ! empty( $this->render_template_file ) ) {
146 146
 
147 147
 			$file = $this->render_template_file;
148 148
 
149 149
 			// If the full path exists, use it
150
-			if( file_exists( $file ) ) {
150
+			if ( file_exists( $file ) ) {
151 151
 				$path = $file;
152 152
 			} else {
153
-				$path = GRAVITYVIEW_DIR .'includes/admin/metaboxes/views/'.$file;
153
+				$path = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/views/' . $file;
154 154
 			}
155 155
 
156
-			if( file_exists( $path ) ) {
156
+			if ( file_exists( $path ) ) {
157 157
 				include $path;
158 158
 			} else {
159 159
 				gravityview()->log->error( 'Metabox template file not found', array( 'data' => $this ) );
160 160
 			}
161 161
 
162
-		} else if( !empty( $this->callback ) ) {
162
+		} else if ( ! empty( $this->callback ) ) {
163 163
 
164
-			if( is_callable( $this->callback ) ) {
164
+			if ( is_callable( $this->callback ) ) {
165 165
 
166 166
 				/** @see do_accordion_sections() */
167
-				call_user_func( $this->callback, $post, (array) $this );
167
+				call_user_func( $this->callback, $post, (array)$this );
168 168
 
169 169
 			} else {
170 170
 				gravityview()->log->error( 'Metabox callback was not callable', array( 'data' => $this ) );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	     * @since 1.11
53 53
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
54 54
 	     */
55
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
55
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
56 56
 
57
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
57
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
58 58
 
59 59
 		    // last resort in case the current user display name don't match any of the defaults
60 60
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public function update_user( $form = array(), $entry_id = 0 ) {
74 74
 
75
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
75
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
76 76
 	        gravityview()->log->error( 'GFAPI or User Registration class not found; not updating the user' );
77 77
 	        return;
78
-        } elseif( empty( $entry_id ) ) {
78
+        } elseif ( empty( $entry_id ) ) {
79 79
         	gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
80 80
 	        return;
81 81
         }
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 	    // If an Update feed, make sure the conditions are met.
104 104
 	    if ( \GV\Utils::get( $config, 'meta/feedType' ) === 'update' ) {
105
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
105
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
106 106
 			    return;
107 107
 		    }
108 108
 	    }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         remove_filter( 'send_email_change_email', '__return_false', 3 );
119 119
 
120 120
         // Prevent double-triggering by removing the hook
121
-	    remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
121
+	    remove_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10 );
122 122
     }
123 123
 
124 124
 	/**
@@ -151,17 +151,17 @@  discard block
 block discarded – undo
151 151
 	     */
152 152
 	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
153 153
 
154
-	    if( $preserve_role ) {
155
-		    $config['meta']['role'] = 'gfur_preserve_role';
154
+	    if ( $preserve_role ) {
155
+		    $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
156 156
 	    }
157 157
 
158
-	    $displayname = $this->match_current_display_name( $entry['created_by'] );
158
+	    $displayname = $this->match_current_display_name( $entry[ 'created_by' ] );
159 159
 
160 160
 	    /**
161 161
 	     * Make sure the current display name is not changed with the update user method.
162 162
 	     * @since 1.15
163 163
 	     */
164
-	    $config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
164
+	    $config[ 'meta' ][ 'displayname' ] = $displayname ? $displayname : $config[ 'meta' ][ 'displayname' ];
165 165
 
166 166
 	    /**
167 167
 	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
         $user = get_userdata( $user_id );
190 190
 
191
-        if( ! $user ) {
191
+        if ( ! $user ) {
192 192
         	return false;
193 193
         }
194 194
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
          * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
201 201
          * @see restore_display_name
202 202
          */
203
-        if( false === $format ) {
203
+        if ( false === $format ) {
204 204
             $this->_user_before_update = $user;
205 205
         }
206 206
 
@@ -218,20 +218,20 @@  discard block
 block discarded – undo
218 218
     public function generate_display_names( $profileuser ) {
219 219
 
220 220
         $public_display = array();
221
-        $public_display['nickname']  = $profileuser->nickname;
222
-        $public_display['username']  = $profileuser->user_login;
221
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
222
+        $public_display[ 'username' ]  = $profileuser->user_login;
223 223
 
224
-        if ( !empty($profileuser->first_name) ) {
225
-	        $public_display['firstname'] = $profileuser->first_name;
224
+        if ( ! empty( $profileuser->first_name ) ) {
225
+	        $public_display[ 'firstname' ] = $profileuser->first_name;
226 226
         }
227 227
 
228
-        if ( !empty($profileuser->last_name) ) {
229
-	        $public_display['lastname'] = $profileuser->last_name;
228
+        if ( ! empty( $profileuser->last_name ) ) {
229
+	        $public_display[ 'lastname' ] = $profileuser->last_name;
230 230
         }
231 231
 
232
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
233
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
234
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
232
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
233
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
234
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
235 235
         }
236 236
 
237 237
         $public_display = array_map( 'trim', $public_display );
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
          *   - or we don't need as we found the correct format before updating user.
271 271
          * @since 1.14.4
272 272
          */
273
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
273
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
274 274
             return null;
275 275
         }
276 276
 
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
         $updated = wp_update_user( $restored_user );
304 304
 
305
-        if( is_wp_error( $updated ) ) {
305
+        if ( is_wp_error( $updated ) ) {
306 306
             gravityview()->log->error( 'There was an error updating user #{user_id} details', array( 'user_id' => $user_id, 'data' => $updated ) );
307 307
         } else {
308 308
             gravityview()->log->debug( 'User #{user_id} details restored', array( 'user_id' => $user_id ) );
Please login to merge, or discard this patch.
includes/class-oembed.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 	static function getInstance() {
43 43
 		gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' );
44 44
 
45
-		if( empty( self::$instance ) ) {
45
+		if ( empty( self::$instance ) ) {
46 46
 			self::$instance = new self;
47 47
 			self::$instance->initialize();
48 48
 		}
Please login to merge, or discard this patch.