Completed
Push — develop ( 34103b...90c25d )
by Zack
19:28
created
includes/admin/entry-list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
12 12
 
13 13
 		// Add script to enable edit link
14
-		add_action( 'admin_head', array( $this, 'add_edit_script') );
14
+		add_action( 'admin_head', array( $this, 'add_edit_script' ) );
15 15
 	}
16 16
 
17 17
 	/**
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 			'page' => 'gf_entries',
61 61
 			'view' => 'entry',
62 62
 			'id'	=> (int)$form_id,
63
-			'lid'	=>	(int)$lead["id"],
63
+			'lid'	=>	(int)$lead[ "id" ],
64 64
 			'screen_mode'	=> 'edit',
65 65
 		);
66 66
 		?>
67 67
 
68 68
 		<span class="edit edit_entry">
69 69
 			|
70
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
70
+		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
71 71
 		</span>
72 72
 		<?php
73 73
 	}
Please login to merge, or discard this patch.
includes/presets/register-default-templates.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 		'GravityView_DataTables_Template' => array(
60 60
 			'slug' => 'dt_placeholder',
61 61
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
62
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
63
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
62
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
63
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
64 64
 			'buy_source' => 'https://gravityview.co/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
65 65
 			'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
66 66
 			'license' => esc_html__( 'All Access', 'gravityview' ),
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 				continue;
103 103
 			}
104 104
 
105
-			$license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 );
106
-			$placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' );
105
+			$license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 );
106
+			$placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' );
107 107
 
108
-			$placeholder['type']     = 'custom';
109
-			$placeholder['included'] = ( $license_price_id >= $placeholder_price_id );
108
+			$placeholder[ 'type' ]     = 'custom';
109
+			$placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id );
110 110
 
111
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
111
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
112 112
 		}
113 113
 
114 114
 	} catch ( Exception $exception ) {
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-admin.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
     function load() {
26 26
 
27
-        if( !is_admin() ) {
27
+        if ( ! is_admin() ) {
28 28
             return;
29 29
         }
30 30
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
         add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
39 39
 
40 40
         // add tooltips
41
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
41
+        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
42 42
 
43 43
         // custom fields' options for zone EDIT
44 44
         add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
      */
78 78
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
79 79
 
80
-        if( $zone !== 'edit' ) {
80
+        if ( $zone !== 'edit' ) {
81 81
 
82
-            $entry_default_fields['edit_link'] = array(
83
-                'label' => __('Link to Edit Entry', 'gravityview'),
82
+            $entry_default_fields[ 'edit_link' ] = array(
83
+                'label' => __( 'Link to Edit Entry', 'gravityview' ),
84 84
                 'type' => 'edit_link',
85
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
85
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
86 86
                 'icon' => 'dashicons-welcome-write-blog',
87 87
             );
88 88
 
@@ -107,12 +107,12 @@  discard block
 block discarded – undo
107 107
         $caps = $visibility_caps;
108 108
 
109 109
         // If we're configuring fields in the edit context, we want a limited selection
110
-        if( $context === 'edit' ) {
110
+        if ( $context === 'edit' ) {
111 111
 
112 112
             // Remove other built-in caps.
113
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
113
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
114 114
 
115
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
115
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
116 116
         }
117 117
 
118 118
         return $caps;
@@ -132,20 +132,20 @@  discard block
 block discarded – undo
132 132
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
133 133
 
134 134
         // Always a link, never a filter
135
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
135
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
136 136
 
137 137
         // Edit Entry link should only appear to visitors capable of editing entries
138
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
138
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
139 139
 
140
-        $add_option['edit_link'] = array(
140
+        $add_option[ 'edit_link' ] = array(
141 141
             'type' => 'text',
142 142
             'label' => __( 'Edit Link Text', 'gravityview' ),
143 143
             'desc' => NULL,
144
-            'value' => __('Edit Entry', 'gravityview'),
144
+            'value' => __( 'Edit Entry', 'gravityview' ),
145 145
             'merge_tags' => true,
146 146
         );
147 147
 
148
-	    $add_option['new_window'] = array(
148
+	    $add_option[ 'new_window' ] = array(
149 149
 		    'type' => 'checkbox',
150 150
 		    'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
151 151
 		    'value' => false,
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 
166 166
         $return = $tooltips;
167 167
 
168
-        $return['allow_edit_cap'] = array(
169
-            'title' => __('Limiting Edit Access', 'gravityview'),
170
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
168
+        $return[ 'allow_edit_cap' ] = array(
169
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
170
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
171 171
         );
172 172
 
173 173
         return $return;
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
189 189
 
190 190
         // We only want to modify the settings for the edit context
191
-        if( 'edit' !== $context ) {
191
+        if ( 'edit' !== $context ) {
192 192
             return $field_options;
193 193
         }
194 194
 
195 195
         //  Entry field is only for logged in users
196
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
196
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
197 197
 
198 198
         $add_options = array(
199 199
             'allow_edit_cap' => array(
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		if ( ! empty( $passed_post ) ) {
22 22
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
23
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
23
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
24 24
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
25 25
 					$this->views->add( \GV\View::by_id( $view_id ) );
26 26
 				}
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 			foreach ( $passed_post as &$post ) {
79 79
 				$views = \GV\View_Collection::from_post( $post );
80 80
 				foreach ( $views->all() as $view ) {
81
-					$ids []= $view->ID;
81
+					$ids [ ] = $view->ID;
82 82
 
83 83
 					/** And as a side-effect... add each view to the global scope. */
84 84
 					if ( ! $this->views->contains( $view->ID ) ) {
@@ -92,18 +92,18 @@  discard block
 block discarded – undo
92 92
 			if ( is_string( $passed_post ) ) {
93 93
 				$shortcodes = \GV\Shortcode::parse( $passed_post );
94 94
 				foreach ( $shortcodes as $shortcode ) {
95
-					if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
96
-						$ids []= $shortcode->atts['id'];
95
+					if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
96
+						$ids [ ] = $shortcode->atts[ 'id' ];
97 97
 
98 98
 						/** And as a side-effect... add each view to the global scope. */
99
-						if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
100
-							$this->views->add( $shortcode->atts['id'] );
99
+						if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
100
+							$this->views->add( $shortcode->atts[ 'id' ] );
101 101
 						}
102 102
 					}
103 103
 				}
104 104
 			} else {
105 105
 				$id = $this->get_id_from_atts( $passed_post );
106
-				$ids[] = intval( $id );
106
+				$ids[ ] = intval( $id );
107 107
 			}
108 108
 		}
109 109
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		// If it's just one ID, return that.
115 115
 		// Otherwise, return array of IDs
116
-		return ( count( $ids ) === 1 ) ? $ids[0] : $ids;
116
+		return ( count( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
117 117
 	}
118 118
 
119 119
 	/**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 */
122 122
 	public static function getInstance( $passed_post = NULL ) {
123 123
 
124
-		if( empty( self::$instance ) ) {
124
+		if ( empty( self::$instance ) ) {
125 125
 			self::$instance = new GravityView_View_Data( $passed_post );
126 126
 		}
127 127
 
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
 			return array();
138 138
 		}
139 139
 		return array_combine(
140
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
141
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
140
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
141
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
142 142
 		);
143 143
 	}
144 144
 
@@ -252,22 +252,22 @@  discard block
 block discarded – undo
252 252
 	public function parse_post_content( $content ) {
253 253
 		$ids = array();
254 254
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
255
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
256
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
257
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
255
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
256
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
257
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
258 258
 				}
259 259
 				/**
260 260
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
261 261
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
262 262
 				 * until better times.
263 263
 				 */
264
-				$ids []= $shortcode->atts['id'];
264
+				$ids [ ] = $shortcode->atts[ 'id' ];
265 265
 			}
266 266
 		}
267 267
 		if ( empty ( $ids ) ) {
268 268
 			return null;
269 269
 		}
270
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
270
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
271 271
 	}
272 272
 
273 273
 	/**
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// Not invalid if not set!
291 291
 		if ( empty( $post_id ) || empty( $view_id ) ) {
292 292
 
293
-			if( $empty_is_valid ) {
293
+			if ( $empty_is_valid ) {
294 294
 				return true;
295 295
 			}
296 296
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
324 324
 
325 325
 			// The post or page specified does not contain the shortcode.
326
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
326
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
327 327
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
328 328
 			}
329 329
 		}
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 		if ( ! $message ) {
332 332
 			// It's a View
333 333
 			if ( \GV\View::exists( $post_id ) ) {
334
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
334
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
335 335
 			}
336 336
 		}
337 337
 
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 	 * @since 1.0
34 34
 	 */
35 35
 	public function __construct() {
36
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
36
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
37 37
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
38
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
39
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
38
+		add_action( 'admin_init', array( $this, 'welcome' ) );
39
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
40 40
 	}
41 41
 
42 42
 	/**
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 		// Add help page to GravityView menu
52 52
 		add_submenu_page(
53 53
 			'edit.php?post_type=gravityview',
54
-			__('GravityView: Getting Started', 'gravityview'),
55
-			__('Getting Started', 'gravityview'),
54
+			__( 'GravityView: Getting Started', 'gravityview' ),
55
+			__( 'Getting Started', 'gravityview' ),
56 56
 			$this->minimum_capability,
57 57
 			'gv-getting-started',
58 58
 			array( $this, 'getting_started_screen' )
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 	 *
86 86
 	 * @return boolean  $is_page   True: yep; false: nope
87 87
 	 */
88
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
88
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
89 89
 		global $plugin_page;
90 90
 
91
-		if($is_page) { return $is_page; }
91
+		if ( $is_page ) { return $is_page; }
92 92
 
93 93
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
94 94
 	}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
106 106
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
107 107
 
108
-		if( !$this->is_dashboard_page() ) { return; }
108
+		if ( ! $this->is_dashboard_page() ) { return; }
109 109
 
110 110
 		?>
111 111
 		<style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html">
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		// Don't fetch -beta, etc.
129 129
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
130 130
 
131
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
131
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
132 132
 
133 133
 		echo gravityview_get_floaty( 132 );
134 134
 		?>
@@ -137,13 +137,13 @@  discard block
 block discarded – undo
137 137
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
138 138
 
139 139
 		<h2 class="nav-tab-wrapper clear">
140
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
140
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
141 141
 				<?php _e( "Getting Started", 'gravityview' ); ?>
142 142
 			</a>
143
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
143
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
144 144
 				<?php _e( "List of Changes", 'gravityview' ); ?>
145 145
 			</a>
146
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
146
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
147 147
 				<?php _e( 'Credits', 'gravityview' ); ?>
148 148
 			</a>
149 149
 		</h2>
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 					<h3>Create a View</h3>
178 178
 
179 179
 					<ol class="ol-decimal">
180
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
180
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
181 181
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
182 182
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
183 183
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 					</ul>
632 632
 
633 633
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
634
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
634
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
635 635
 				</div>
636 636
 			</div>
637 637
 
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 		global $plugin_page;
674 674
 
675 675
 		// Bail if we're just editing the plugin
676
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
676
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
677 677
 
678 678
 		// Bail if no activation redirect
679 679
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 		$upgrade = get_option( 'gv_version_upgraded_from' );
685 685
 
686 686
 		// Don't do anything if they've already seen the new version info
687
-		if( $upgrade === GravityView_Plugin::version ) {
687
+		if ( $upgrade === GravityView_Plugin::version ) {
688 688
 			return;
689 689
 		}
690 690
 
@@ -692,10 +692,10 @@  discard block
 block discarded – undo
692 692
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
693 693
 
694 694
 		// Bail if activating from network, or bulk
695
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
695
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
696 696
 
697 697
 		// First time install
698
-		if( ! $upgrade ) {
698
+		if ( ! $upgrade ) {
699 699
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
700 700
 		}
701 701
 		// Update
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		if ( ! $detailed ) {
556 556
 			$defaults = array();
557 557
 			foreach ( $default_settings as $key => $value ) {
558
-				$defaults[ $key ] = $value['value'];
558
+				$defaults[ $key ] = $value[ 'value' ];
559 559
 			}
560 560
 			return $defaults;
561 561
 
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 				// If the $group argument is set for the method,
567 567
 				// ignore any settings that aren't in that group.
568 568
 				if ( ! empty( $group ) && is_string( $group ) ) {
569
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
569
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
570 570
 						unset( $default_settings[ $key ] );
571 571
 					}
572 572
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-plugin.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 			return;
305 305
 		}
306 306
 
307
-		$locale = apply_filters( 'plugin_locale', ( ( function_exists('get_user_locale') && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
307
+		$locale = apply_filters( 'plugin_locale', ( ( function_exists( 'get_user_locale' ) && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
308 308
 
309 309
 		gravityview()->log->error( sprintf( 'Unable to load textdomain for %s locale.', $locale ) );
310 310
 	}
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
 	 */
527 527
 	private function get_php_version() {
528 528
 
529
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
530
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
529
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
530
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
531 531
 	}
532 532
 
533 533
 	/**
@@ -539,8 +539,8 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	private function get_wordpress_version() {
541 541
 
542
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
543
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
542
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
543
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
544 544
 	}
545 545
 
546 546
 	/**
@@ -552,14 +552,14 @@  discard block
 block discarded – undo
552 552
 	 */
553 553
 	private function get_gravityforms_version() {
554 554
 
555
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
555
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
556 556
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
557 557
 
558 558
 			return null;
559 559
 		}
560 560
 
561
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
562
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
561
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
562
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
563 563
 	}
564 564
 
565 565
 	/**
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 		$items = get_posts( array(
606 606
 			'post_type'   => 'gravityview',
607 607
 			'post_status' => 'any',
608
-			'numberposts' => - 1,
608
+			'numberposts' => -1,
609 609
 			'fields'      => 'ids',
610 610
 		) );
611 611
 
@@ -619,9 +619,9 @@  discard block
 block discarded – undo
619 619
 		$tables = array();
620 620
 
621 621
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
622
-			$tables [] = \GFFormsModel::get_entry_meta_table_name();
622
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
623 623
 		} elseif ( ! $this->is_GF_25() ) {
624
-			$tables [] = \GFFormsModel::get_lead_meta_table_name();
624
+			$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
625 625
 		}
626 626
 
627 627
 		foreach ( $tables as $meta_table ) {
@@ -640,9 +640,9 @@  discard block
 block discarded – undo
640 640
 		$tables = array();
641 641
 
642 642
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
643
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
643
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
644 644
 		} elseif ( ! $this->is_GF_25() ) {
645
-			$tables[] = \GFFormsModel::get_lead_notes_table_name();
645
+			$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
646 646
 		}
647 647
 
648 648
 		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function maybe_add_article_to_tooltip( $tooltip = '', $article = array(), $url = '', $atts = '', $css_class = '', $anchor_text = '' ) {
55 55
 
56
-		if ( empty( $article['id'] ) ) {
56
+		if ( empty( $article[ 'id' ] ) ) {
57 57
 			return $tooltip;
58 58
 		}
59 59
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
 
70 70
 		$css_class .= ' gv_tooltip';
71 71
 
72
-		if ( ! empty( $article['type'] ) ) {
73
-			$atts = sprintf( 'data-beacon-article-%s="%s"', $article['type'], $article['id'] );
72
+		if ( ! empty( $article[ 'type' ] ) ) {
73
+			$atts = sprintf( 'data-beacon-article-%s="%s"', $article[ 'type' ], $article[ 'id' ] );
74 74
 		} else {
75
-			$atts = sprintf( 'data-beacon-article="%s"', $article['id'] );
75
+			$atts = sprintf( 'data-beacon-article="%s"', $article[ 'id' ] );
76 76
 		}
77 77
 
78 78
 		$url = \GV\Utils::get( $article, 'url', '#' );
@@ -172,9 +172,9 @@  discard block
 block discarded – undo
172 172
 		) );
173 173
 
174 174
 		// This is just HTML we don't need.
175
-		unset( $response['message'] );
175
+		unset( $response[ 'message' ] );
176 176
 
177
-		switch ( intval( $response['price_id'] ) ) {
177
+		switch ( intval( $response[ 'price_id' ] ) ) {
178 178
 			default:
179 179
 			case 1:
180 180
 				$package = 'Core';
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
202 202
 			'signature'             => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ),
203 203
 			'affiliate_id'          => gravityview()->plugin->settings->get( 'affiliate_id' ),
204 204
 			'is_super_admin'        => is_super_admin(),
205
-			'license_key'           => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')',
205
+			'license_key'           => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')',
206 206
 			'license_level'         => $package,
207 207
 			'alt_emails'            => sprintf( 'Admin: %s, GV Support: %s', get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ),
208
-			'payment_details'       => $response['customer_name'] . ' ' . $response['customer_email'],
208
+			'payment_details'       => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ],
209 209
 			'wordpress_version'     => get_bloginfo( 'version', 'display' ),
210
-			'php_version'           => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ),
210
+			'php_version'           => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ),
211 211
 			'no_conflict_mode'      => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled',
212 212
 			'gravityview_version'   => \GV\Plugin::$version,
213 213
 			'gravity_forms_version' => GFForms::$version,
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		ob_get_clean();
218 218
 
219 219
 		// Help Scout length limit is 200 characters
220
-		foreach( $data as $key => $value ) {
220
+		foreach ( $data as $key => $value ) {
221 221
 			if ( ! is_string( $value ) ) {
222 222
                 continue;
223 223
 			}
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
48 48
 		$this->api_data    = $_api_data;
49 49
 		$this->name        = plugin_basename( $_plugin_file );
50 50
 		$this->slug        = basename( $_plugin_file, '.php' );
51
-		$this->version     = $_api_data['version'];
52
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
53
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
54
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
51
+		$this->version     = $_api_data[ 'version' ];
52
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
53
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
54
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
55 55
 
56 56
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
57 57
 
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 			return;
174 174
 		}
175 175
 
176
-		if( ! current_user_can( 'update_plugins' ) ) {
176
+		if ( ! current_user_can( 'update_plugins' ) ) {
177 177
 			return;
178 178
 		}
179 179
 
180
-		if( ! is_multisite() ) {
180
+		if ( ! is_multisite() ) {
181 181
 			return;
182 182
 		}
183 183
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
270 270
 					esc_html( $version_info->new_version ),
271 271
 					'</a>',
272
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
272
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
273 273
 					'</a>'
274 274
 				);
275 275
 			}
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
354 354
 		}
355 355
 
356
-		if( ! isset( $_data->plugin ) ) {
356
+		if ( ! isset( $_data->plugin ) ) {
357 357
 			$_data->plugin = $this->name;
358 358
 		}
359 359
 
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 		$verify_ssl = $this->verify_ssl();
397 397
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
398
-			$args['sslverify'] = $verify_ssl;
398
+			$args[ 'sslverify' ] = $verify_ssl;
399 399
 		}
400 400
 		return $args;
401 401
 
@@ -423,9 +423,9 @@  discard block
 block discarded – undo
423 423
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
424 424
 			$test_url_parts = parse_url( $this->api_url );
425 425
 
426
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
427
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
428
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
426
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
427
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
428
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
429 429
 
430 430
 			if ( empty( $host ) ) {
431 431
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -442,27 +442,27 @@  discard block
 block discarded – undo
442 442
 
443 443
 		$data = array_merge( $this->api_data, $_data );
444 444
 
445
-		if ( $data['slug'] != $this->slug ) {
445
+		if ( $data[ 'slug' ] != $this->slug ) {
446 446
 			return false;
447 447
 		}
448 448
 
449
-		if ( $this->api_url == trailingslashit ( home_url() ) ) {
449
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
450 450
 			return false; // Don't allow a plugin to ping itself
451 451
 		}
452 452
 
453 453
 		$api_params = array(
454 454
 			'edd_action' => 'get_version',
455
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
456
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
457
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
458
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
459
-			'slug'       => $data['slug'],
460
-			'author'     => $data['author'],
455
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
456
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
457
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
458
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
459
+			'slug'       => $data[ 'slug' ],
460
+			'author'     => $data[ 'author' ],
461 461
 			'url'        => home_url(),
462
-			'beta'       => ! empty( $data['beta'] ),
462
+			'beta'       => ! empty( $data[ 'beta' ] ),
463 463
 		);
464 464
 
465
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
465
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
466 466
 
467 467
 		if ( ! is_wp_error( $request ) ) {
468 468
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -483,8 +483,8 @@  discard block
 block discarded – undo
483 483
 		}
484 484
 
485 485
 		if ( ! empty( $request->sections ) ) {
486
-			foreach( $request->sections as $key => $section ) {
487
-				$request->$key = (array) $section;
486
+			foreach ( $request->sections as $key => $section ) {
487
+				$request->$key = (array)$section;
488 488
 			}
489 489
 		}
490 490
 
@@ -498,35 +498,35 @@  discard block
 block discarded – undo
498 498
 
499 499
 		global $edd_plugin_data;
500 500
 
501
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
501
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
502 502
 			return;
503 503
 		}
504 504
 
505
-		if( empty( $_REQUEST['plugin'] ) ) {
505
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
506 506
 			return;
507 507
 		}
508 508
 
509
-		if( empty( $_REQUEST['slug'] ) ) {
509
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
510 510
 			return;
511 511
 		}
512 512
 
513
-		if( ! current_user_can( 'update_plugins' ) ) {
513
+		if ( ! current_user_can( 'update_plugins' ) ) {
514 514
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
515 515
 		}
516 516
 
517
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
517
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
518 518
 		$version_info = $this->get_cached_version_info();
519 519
 
520
-		if( false === $version_info ) {
520
+		if ( false === $version_info ) {
521 521
 
522 522
 			$api_params = array(
523 523
 				'edd_action' => 'get_version',
524
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
525
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
526
-				'slug'       => $_REQUEST['slug'],
527
-				'author'     => $data['author'],
524
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
525
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
526
+				'slug'       => $_REQUEST[ 'slug' ],
527
+				'author'     => $data[ 'author' ],
528 528
 				'url'        => home_url(),
529
-				'beta'       => ! empty( $data['beta'] )
529
+				'beta'       => ! empty( $data[ 'beta' ] )
530 530
 			);
531 531
 
532 532
 			$verify_ssl = $this->verify_ssl();
@@ -542,22 +542,22 @@  discard block
 block discarded – undo
542 542
 				$version_info = false;
543 543
 			}
544 544
 
545
-			if( ! empty( $version_info ) ) {
546
-				foreach( $version_info->sections as $key => $section ) {
547
-					$version_info->$key = (array) $section;
545
+			if ( ! empty( $version_info ) ) {
546
+				foreach ( $version_info->sections as $key => $section ) {
547
+					$version_info->$key = (array)$section;
548 548
 				}
549 549
 			}
550 550
 
551 551
 			$this->set_version_info_cache( $version_info );
552 552
 
553 553
 			// Delete the unneeded option
554
-			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $this->beta . '_version_info' ) );
554
+			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $this->beta . '_version_info' ) );
555 555
 		}
556 556
 
557 557
 		if ( isset( $version_info->sections ) ) {
558 558
 			$sections = $this->convert_object_to_array( $version_info->sections );
559
-			if ( ! empty( $sections['changelog'] ) ) {
560
-				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>';
559
+			if ( ! empty( $sections[ 'changelog' ] ) ) {
560
+				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>';
561 561
 			}
562 562
 		}
563 563
 
@@ -572,25 +572,25 @@  discard block
 block discarded – undo
572 572
 	 */
573 573
 	public function get_cached_version_info( $cache_key = '' ) {
574 574
 
575
-		if( empty( $cache_key ) ) {
575
+		if ( empty( $cache_key ) ) {
576 576
 			$cache_key = $this->cache_key;
577 577
 		}
578 578
 
579 579
 		$cache = get_option( $cache_key );
580 580
 
581
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
581
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
582 582
 			return false; // Cache is expired
583 583
 		}
584 584
 
585 585
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
586
-		$cache['value'] = json_decode( $cache['value'] );
587
-		if ( ! empty( $cache['value']->icons ) ) {
588
-			$cache['value']->icons = (array) $cache['value']->icons;
589
-		} elseif ( $cache['value'] ) {
590
-			$cache['value']->icons = array();
586
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
587
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
588
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
589
+		} elseif ( $cache[ 'value' ] ) {
590
+			$cache[ 'value' ]->icons = array();
591 591
 		}
592 592
 
593
-		return $cache['value'];
593
+		return $cache[ 'value' ];
594 594
 
595 595
 	}
596 596
 
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
 	 */
603 603
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
604 604
 
605
-		if( empty( $cache_key ) ) {
605
+		if ( empty( $cache_key ) ) {
606 606
 			$cache_key = $this->cache_key;
607 607
 		}
608 608
 
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		update_option( $cache_key, $data, 'no' );
615 615
 
616 616
 		// Delete the duplicate option
617
-		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) );
617
+		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) );
618 618
 	}
619 619
 
620 620
 	/**
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
 	 * @return bool
625 625
 	 */
626 626
 	private function verify_ssl() {
627
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
627
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
628 628
 	}
629 629
 
630 630
 }
Please login to merge, or discard this patch.