Completed
Push — develop ( 7f1301...799090 )
by
unknown
17:22
created
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.