Completed
Pull Request — master (#1171)
by Zack
95:41 queued 34:43
created
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
 		$this->api_data    = $_api_data;
39 39
 		$this->name        = plugin_basename( $_plugin_file );
40 40
 		$this->slug        = basename( $_plugin_file, '.php' );
41
-		$this->version     = $_api_data['version'];
42
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
43
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
44
-		$this->cache_key   = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
41
+		$this->version     = $_api_data[ 'version' ];
42
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
43
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
44
+		$this->cache_key   = md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
45 45
 
46 46
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
47 47
 
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 			return;
134 134
 		}
135 135
 
136
-		if( ! current_user_can( 'update_plugins' ) ) {
136
+		if ( ! current_user_can( 'update_plugins' ) ) {
137 137
 			return;
138 138
 		}
139 139
 
140
-		if( ! is_multisite() ) {
140
+		if ( ! is_multisite() ) {
141 141
 			return;
142 142
 		}
143 143
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
213 213
 					esc_html( $version_info->new_version ),
214 214
 					'</a>',
215
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
215
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
216 216
 					'</a>'
217 217
 				);
218 218
 			}
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 			)
257 257
 		);
258 258
 
259
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
259
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
260 260
 
261 261
 		// Get the transient where we store the api request for this plugin for 24 hours
262 262
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 
312 312
 		$verify_ssl = $this->verify_ssl();
313 313
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
314
-			$args['sslverify'] = $verify_ssl;
314
+			$args[ 'sslverify' ] = $verify_ssl;
315 315
 		}
316 316
 		return $args;
317 317
 
@@ -334,24 +334,24 @@  discard block
 block discarded – undo
334 334
 
335 335
 		$data = array_merge( $this->api_data, $_data );
336 336
 
337
-		if ( $data['slug'] != $this->slug ) {
337
+		if ( $data[ 'slug' ] != $this->slug ) {
338 338
 			return;
339 339
 		}
340 340
 
341
-		if( $this->api_url == trailingslashit (home_url() ) ) {
341
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
342 342
 			return false; // Don't allow a plugin to ping itself
343 343
 		}
344 344
 
345 345
 		$api_params = array(
346 346
 			'edd_action' => 'get_version',
347
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
348
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
349
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
350
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
351
-			'slug'       => $data['slug'],
352
-			'author'     => $data['author'],
347
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
348
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
349
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
350
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
351
+			'slug'       => $data[ 'slug' ],
352
+			'author'     => $data[ 'author' ],
353 353
 			'url'        => home_url(),
354
-			'beta'       => ! empty( $data['beta'] ),
354
+			'beta'       => ! empty( $data[ 'beta' ] ),
355 355
 		);
356 356
 
357 357
 		$verify_ssl = $this->verify_ssl();
@@ -371,9 +371,9 @@  discard block
 block discarded – undo
371 371
 			$request->banners = maybe_unserialize( $request->banners );
372 372
 		}
373 373
 
374
-		if( ! empty( $request->sections ) ) {
375
-			foreach( $request->sections as $key => $section ) {
376
-				$request->$key = (array) $section;
374
+		if ( ! empty( $request->sections ) ) {
375
+			foreach ( $request->sections as $key => $section ) {
376
+				$request->$key = (array)$section;
377 377
 			}
378 378
 		}
379 379
 
@@ -384,37 +384,37 @@  discard block
 block discarded – undo
384 384
 
385 385
 		global $edd_plugin_data;
386 386
 
387
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
387
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
388 388
 			return;
389 389
 		}
390 390
 
391
-		if( empty( $_REQUEST['plugin'] ) ) {
391
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $_REQUEST['slug'] ) ) {
395
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399
-		if( ! current_user_can( 'update_plugins' ) ) {
399
+		if ( ! current_user_can( 'update_plugins' ) ) {
400 400
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
401 401
 		}
402 402
 
403
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
404
-		$beta         = ! empty( $data['beta'] ) ? true : false;
405
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
403
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
404
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
405
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
406 406
 		$version_info = $this->get_cached_version_info( $cache_key );
407 407
 
408
-		if( false === $version_info ) {
408
+		if ( false === $version_info ) {
409 409
 
410 410
 			$api_params = array(
411 411
 				'edd_action' => 'get_version',
412
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
413
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
414
-				'slug'       => $_REQUEST['slug'],
415
-				'author'     => $data['author'],
412
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
413
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
414
+				'slug'       => $_REQUEST[ 'slug' ],
415
+				'author'     => $data[ 'author' ],
416 416
 				'url'        => home_url(),
417
-				'beta'       => ! empty( $data['beta'] )
417
+				'beta'       => ! empty( $data[ 'beta' ] )
418 418
 			);
419 419
 
420 420
 			$verify_ssl = $this->verify_ssl();
@@ -431,9 +431,9 @@  discard block
 block discarded – undo
431 431
 				$version_info = false;
432 432
 			}
433 433
 
434
-			if( ! empty( $version_info ) ) {
435
-				foreach( $version_info->sections as $key => $section ) {
436
-					$version_info->$key = (array) $section;
434
+			if ( ! empty( $version_info ) ) {
435
+				foreach ( $version_info->sections as $key => $section ) {
436
+					$version_info->$key = (array)$section;
437 437
 				}
438 438
 			}
439 439
 
@@ -441,8 +441,8 @@  discard block
 block discarded – undo
441 441
 
442 442
 		}
443 443
 
444
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
445
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
444
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
445
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
446 446
 		}
447 447
 
448 448
 		exit;
@@ -450,23 +450,23 @@  discard block
 block discarded – undo
450 450
 
451 451
 	public function get_cached_version_info( $cache_key = '' ) {
452 452
 
453
-		if( empty( $cache_key ) ) {
453
+		if ( empty( $cache_key ) ) {
454 454
 			$cache_key = $this->cache_key;
455 455
 		}
456 456
 
457 457
 		$cache = get_option( $cache_key );
458 458
 
459
-		if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) {
459
+		if ( empty( $cache[ 'timeout' ] ) || current_time( 'timestamp' ) > $cache[ 'timeout' ] ) {
460 460
 			return false; // Cache is expired
461 461
 		}
462 462
 
463
-		return json_decode( $cache['value'] );
463
+		return json_decode( $cache[ 'value' ] );
464 464
 
465 465
 	}
466 466
 
467 467
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
468 468
 
469
-		if( empty( $cache_key ) ) {
469
+		if ( empty( $cache_key ) ) {
470 470
 			$cache_key = $this->cache_key;
471 471
 		}
472 472
 
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 	 * @return bool
487 487
 	 */
488 488
 	private function verify_ssl() {
489
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
489
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
490 490
 	}
491 491
 
492 492
 }
Please login to merge, or discard this patch.
future/loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
26 26
 			printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
27 27
 			printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
28
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
28
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
29 29
 			printf( '</body>' );
30 30
 		}
31 31
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
37
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
37
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
38 38
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
39 39
 
40 40
 /** All looks fine. */
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public static function remove() {
78 78
 		$shortcode = new static();
79
-		unset( self::$shortcodes[$shortcode->name] );
79
+		unset( self::$shortcodes[ $shortcode->name ] );
80 80
 		remove_shortcode( $shortcode->name );
81 81
 	}
82 82
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
109 109
 
110 110
 		foreach ( $matches as $shortcode ) {
111
-			$shortcode_name = $shortcode[2];
111
+			$shortcode_name = $shortcode[ 2 ];
112 112
 
113
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
114
-			$shortcode_content = $shortcode[5];
113
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
114
+			$shortcode_content = $shortcode[ 5 ];
115 115
 
116 116
 			/** This is a registered GravityView shortcode. */
117
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
118
-				$shortcode = clone self::$shortcodes[$shortcode_name];
117
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
118
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
119 119
 			} else {
120 120
 				/** This is some generic shortcode. */
121 121
 				$shortcode = new self;
Please login to merge, or discard this patch.
future/includes/class-gv-field-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
27 27
 	 * @return \GV\GF_Field|null The field implementation or null on error.
28 28
 	 */
29 29
 	public static function from_configuration( $configuration ) {
30
-		if ( empty( $configuration['id'] ) || ! is_numeric( $configuration['id'] ) ) {
30
+		if ( empty( $configuration[ 'id' ] ) || ! is_numeric( $configuration[ 'id' ] ) ) {
31 31
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
32 32
 			return null;
33 33
 		}
34 34
 
35
-		if ( empty( $configuration['form_id'] ) || ! $form = \GV\GF_Form::by_id( $configuration['form_id'] )  ) {
35
+		if ( empty( $configuration[ 'form_id' ] ) || ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
36 36
 			gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
37 37
 			return null;
38 38
 		}
39 39
 
40
-		$field = self::by_id( $form, $configuration['id'] );
40
+		$field = self::by_id( $form, $configuration[ 'id' ] );
41 41
 
42 42
 		if ( ! $field ) {
43 43
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 		/** This is a complex Gravity Forms input. */
113 113
 		if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
114
-			$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
114
+			$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
115 115
 		} else {
116 116
 			/** This is a field with one label. */
117 117
 			$label = $this->field->get_field_label( true, $this->label );
Please login to merge, or discard this patch.
future/includes/class-gv-widget.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
152 152
 
153 153
 		if ( $enable_custom_class ) {
154
-			$settings['custom_class'] = array(
154
+			$settings[ 'custom_class' ] = array(
155 155
 				'type' => 'text',
156 156
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
157 157
 				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 */
204 204
 	public static function get_default_widget_areas() {
205 205
 		$default_areas = array(
206
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
207
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
206
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
207
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
208 208
 		);
209 209
 
210 210
 		/**
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		}
235 235
 
236 236
 		$widgets[ $this->get_widget_id() ] = array(
237
-			'label' => $this->widget_label ,
237
+			'label' => $this->widget_label,
238 238
 			'description' => $this->widget_description,
239 239
 			'subtitle' => $this->widget_subtitle,
240 240
 			'class' => get_called_class(),
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
257 257
 		if ( $this->get_widget_id() === $widget ) {
258
-			if( $settings = $this->get_settings() ) {
258
+			if ( $settings = $this->get_settings() ) {
259 259
 				$options = array_merge( $options, $settings );
260 260
 			}
261 261
 		}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 			return;
307 307
 		}
308 308
 
309
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
309
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
310 310
 	}
311 311
 
312 312
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry-legacy.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
 		global $post;
35 35
 
36 36
 		if ( $post ) {
37
-			$context['post'] = $post;
37
+			$context[ 'post' ] = $post;
38 38
 		}
39 39
 
40 40
 		\GV\Mocks\Legacy_Context::push( $context );
Please login to merge, or discard this patch.
future/includes/class-gv-core.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -113,14 +113,14 @@
 block discarded – undo
113 113
 
114 114
 		/** Require critical legacy core files. @todo Deprecate */
115 115
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
116
-		require_once $this->plugin->dir( 'includes/class-common.php');
117
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
116
+		require_once $this->plugin->dir( 'includes/class-common.php' );
117
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
118 118
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
119 119
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
120 120
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
121 121
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
122
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
123
-		require_once $this->plugin->dir( 'includes/class-cache.php');
122
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
123
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
124 124
 
125 125
 		/**
126 126
 		 * GravityView extensions and widgets.
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -113,18 +113,18 @@
 block discarded – undo
113 113
 		global $post;
114 114
 
115 115
 		if ( ! $this->request->is_view() && $post ) {
116
-			$specifics []= sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
117
-			$specifics []= sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
118
-			$specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
119
-			$specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
116
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
117
+			$specifics [ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
118
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
119
+			$specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
120 120
 		}
121 121
 
122
-		$specifics []= sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
123
-		$specifics []= sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
124
-		$specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
125
-		$specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
122
+		$specifics [ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
123
+		$specifics [ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
124
+		$specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
125
+		$specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
126 126
 
127
-		$specifics []= sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
127
+		$specifics [ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
128 128
 
129 129
 		return array_merge( $specifics, $templates );
130 130
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry-sort.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 		if ( $this->field ) {
79 79
 			return array(
80 80
 				'key' => $this->field->ID,
81
-				'direction' => $this->direction ? : self::ASC,
81
+				'direction' => $this->direction ?: self::ASC,
82 82
 				'is_numeric' => self::ALPHA ? true : false,
83 83
 			);
84 84
 		}
Please login to merge, or discard this patch.