Completed
Pull Request — master (#822)
by Zack
23:55 queued 20:40
created
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 
614 614
             $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
615 615
 
616
-            if( ! $this->is_valid ){
616
+            if( ! $this->is_valid ) {
617 617
 
618 618
                 // Keeping this compatible with Gravity Forms.
619 619
                 $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
@@ -1620,9 +1620,7 @@  discard block
 block discarded – undo
1620 1620
         // Verify
1621 1621
         else if( ! $this->is_edit_entry() ) {
1622 1622
             $valid = false;
1623
-        }
1624
-
1625
-        else {
1623
+        } else {
1626 1624
             $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1627 1625
         }
1628 1626
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-no-conflict.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 		// Dequeue other jQuery styles even if no-conflict is off.
118 118
 		// Terrible-looking tabs help no one.
119
-		if( !empty( $wp_styles->registered ) )  {
119
+		if( !empty( $wp_styles->registered ) ) {
120 120
 			foreach ($wp_styles->registered as $key => $style) {
121 121
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
122 122
 					wp_dequeue_style( $key );
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
 		//unregistering scripts
191 191
 		$registered = array();
192
-		foreach( $wp_objects->registered as $handle => $script_registration ){
193
-			if( in_array( $handle, $required_objects ) ){
192
+		foreach( $wp_objects->registered as $handle => $script_registration ) {
193
+			if( in_array( $handle, $required_objects ) ) {
194 194
 				$registered[ $handle ] = $script_registration;
195 195
 			}
196 196
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-password.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	 *
50 50
 	 * @return string If a custom field label isn't set, return the field label for the password field
51 51
 	 */
52
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
52
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
53 53
 
54 54
 		// If using a custom label, no need to fetch the parent label
55 55
 		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 				}
263 263
 
264 264
 
265
-				if( GFCommon::is_product_field( $field['type'] ) ){
265
+				if( GFCommon::is_product_field( $field['type'] ) ) {
266 266
 					$has_product_fields = true;
267 267
 				}
268 268
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 
323 323
 		$fields = array();
324 324
 
325
-		foreach ( $extra_fields as $key => $field ){
325
+		foreach ( $extra_fields as $key => $field ) {
326 326
 			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
327 327
 				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
328 328
 			}
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
888 888
 	 * @return GF_Field|null Gravity Forms field object, or NULL: Gravity Forms GFFormsModel does not exist or field at $field_id doesn't exist.
889 889
 	 */
890 890
 	public static function get_field( $form, $field_id ) {
891
-		if ( class_exists( 'GFFormsModel' ) ){
891
+		if ( class_exists( 'GFFormsModel' ) ) {
892 892
 			return GFFormsModel::get_field( $form, $field_id );
893 893
 		} else {
894 894
 			return null;
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
935 935
 			$shortcodes = array();
936 936
 
937 937
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
938
-			if ( empty( $matches ) ){
938
+			if ( empty( $matches ) ) {
939 939
 				return false;
940 940
 			}
941 941
 
Please login to merge, or discard this patch.