Completed
Pull Request — master (#991)
by Zack
12:50 queued 09:33
created
includes/extensions/edit-entry/class-edit-entry-render.php 2 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
359 359
 
360 360
 		/**
361 361
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
362
-         * @since 1.22.2
363
-         * @param bool $unset_hidden_field_values Default: true
364
-         * @param GravityView_Edit_Entry_Render $this This object
362
+		 * @since 1.22.2
363
+		 * @param bool $unset_hidden_field_values Default: true
364
+		 * @param GravityView_Edit_Entry_Render $this This object
365 365
 		 */
366 366
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
367 367
 
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 			return;
370 370
 		}
371 371
 
372
-        if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
372
+		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
373 373
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
374 374
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
375 375
 		} else {
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
1288 1288
 
1289 1289
 			// TODO: Remove when minimum GF Version is 2.0.6.5
1290 1290
 			if( ! isset( $field->visibility ) && ! isset( $field->adminOnly ) ) {
1291
-			    $field->adminOnly = NULL;
1291
+				$field->adminOnly = NULL;
1292 1292
 			}
1293 1293
 
1294 1294
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1771,8 +1771,8 @@  discard block
 block discarded – undo
1771 1771
 		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1772 1772
 		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1773 1773
 		 * @since 1.9.1
1774
-         * @since 1.22.6 Deprecated
1775
-         * @deprecated Use gravityview/edit_entry/use_gf_visibility_setting instead
1774
+		 * @since 1.22.6 Deprecated
1775
+		 * @deprecated Use gravityview/edit_entry/use_gf_visibility_setting instead
1776 1776
 		 * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
1777 1777
 		 * @param array $form GF Form array
1778 1778
 		 * @param int $view_id View ID
@@ -1798,7 +1798,7 @@  discard block
 block discarded – undo
1798 1798
 						unset( $fields[ $k ] );
1799 1799
 					}
1800 1800
 				} else{
1801
-				    if( 'administrative' === $field->visibility ) {
1801
+					if( 'administrative' === $field->visibility ) {
1802 1802
 						unset( $fields[ $k ] );
1803 1803
 					}
1804 1804
 				}
@@ -1808,25 +1808,25 @@  discard block
 block discarded – undo
1808 1808
 
1809 1809
 		foreach( $fields as &$field ) {
1810 1810
 
1811
-		    // TODO: Remove when minimum GF Version is 2.0.6.5
1812
-		    if( ! isset( $field->visibility ) ) {
1811
+			// TODO: Remove when minimum GF Version is 2.0.6.5
1812
+			if( ! isset( $field->visibility ) ) {
1813 1813
 
1814
-			    $field->adminOnly = false;
1814
+				$field->adminOnly = false;
1815 1815
 
1816
-		    } else {
1816
+			} else {
1817 1817
 
1818
-			    /**
1819
-			     * @filter `gravityview/edit_entry/make_all_fields_visible` Set field visibility to "visible" for all fields
1820
-			     * @since 1.22.6
1821
-			     *
1822
-			     * @param string $visibility 'visible' by default. Default options are 'hidden', 'visible', and 'administrative'
1823
-			     * @param GF_Field $field Form field being modified
1824
-			     * @param int $view_id Current View ID
1825
-			     */
1826
-			    $visibility = apply_filters( 'gravityview/edit_entry/field_visibility', 'visible', $field, $view_id );
1818
+				/**
1819
+				 * @filter `gravityview/edit_entry/make_all_fields_visible` Set field visibility to "visible" for all fields
1820
+				 * @since 1.22.6
1821
+				 *
1822
+				 * @param string $visibility 'visible' by default. Default options are 'hidden', 'visible', and 'administrative'
1823
+				 * @param GF_Field $field Form field being modified
1824
+				 * @param int $view_id Current View ID
1825
+				 */
1826
+				$visibility = apply_filters( 'gravityview/edit_entry/field_visibility', 'visible', $field, $view_id );
1827 1827
 
1828
-			    $field->visibility = $visibility;
1829
-		    }
1828
+				$field->visibility = $visibility;
1829
+			}
1830 1830
 		}
1831 1831
 
1832 1832
 		return $fields;
Please login to merge, or discard this patch.
Braces   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -953,7 +953,7 @@  discard block
 block discarded – undo
953 953
 
954 954
 			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
955 955
 
956
-			if( ! $this->is_valid ){
956
+			if( ! $this->is_valid ) {
957 957
 
958 958
 				// Keeping this compatible with Gravity Forms.
959 959
 				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
@@ -1797,7 +1797,7 @@  discard block
 block discarded – undo
1797 1797
 					if( $field->adminOnly ) {
1798 1798
 						unset( $fields[ $k ] );
1799 1799
 					}
1800
-				} else{
1800
+				} else {
1801 1801
 				    if( 'administrative' === $field->visibility ) {
1802 1802
 						unset( $fields[ $k ] );
1803 1803
 					}
@@ -2101,9 +2101,7 @@  discard block
 block discarded – undo
2101 2101
 		// Verify
2102 2102
 		else if( ! $this->is_edit_entry() ) {
2103 2103
 			$valid = false;
2104
-		}
2105
-
2106
-		else {
2104
+		} else {
2107 2105
 			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
2108 2106
 		}
2109 2107
 
Please login to merge, or discard this patch.