View GitHub Repository GravityView

Schedule Inspection
Subscribe
Completed
Push — develop ( d53d64...92f117 )
by Zack
18:11 queued 14:25
created
Status
Category
Toggle Patches
future/includes/class-gv-template-view-table.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -69,22 +69,22 @@  discard block
 
 block discarded – undo
69 69 
 			if ( is_array( $sorts ) ) {
70 70 
 				foreach ( (array)$sorts as $key => $direction ) {
71 71 
 					if ( $key == $context->field->ID ) {
72 
-						$sorting['key'] = $context->field->ID;
73 
-						$sorting['direction'] = strtolower( $direction );
72 
+						$sorting[ 'key' ] = $context->field->ID;
73 
+						$sorting[ 'direction' ] = strtolower( $direction );
74 74 
 						break;
75 75 
 					}
76 76 
 				}
77 77 
 			} else {
78 78 
 				if ( $sorts == $context->field->ID ) {
79 
-					$sorting['key'] = $context->field->ID;
80 
-					$sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) );
79 
+					$sorting[ 'key' ] = $context->field->ID;
80 
+					$sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) );
81 81 
 				}
82 82 
 			}
83 83 
 		} else {
84 84 
 			foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) {
85 85 
 				if ( $sort_field == $context->field->ID ) {
86 
-					$sorting['key'] = $sort_field;
87 
-					$sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) );
86 
+					$sorting[ 'key' ] = $sort_field;
87 
+					$sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) );
88 88 
 					break; // Only get the first sort
89 89 
 				}
90 90 
 			}
 
@@ -100,21 +100,21 @@  discard block
 
 block discarded – undo
100 100 
 		);
101 101
102 102 
 		// If we are already sorting by the current field...
103 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
103 
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
104 104
105 
-		    switch( $sorting['direction'] ) {
105 
+		    switch ( $sorting[ 'direction' ] ) {
106 106 
 		        // No sort
107 107 
                 case '':
108 
-	                $sort_args[1] = 'asc';
108 
+	                $sort_args[ 1 ] = 'asc';
109 109 
 	                $class .= ' gv-icon-caret-up-down';
110 110 
                     break;
111 111 
                 case 'desc':
112 
-	                $sort_args[1] = '';
112 
+	                $sort_args[ 1 ] = '';
113 113 
 	                $class .= ' gv-icon-sort-asc';
114 114 
 	                break;
115 115 
                 case 'asc':
116 116 
                 default:
117 
-                    $sort_args[1] = 'desc';
117 
+                    $sort_args[ 1 ] = 'desc';
118 118 
                     $class .= ' gv-icon-sort-desc';
119 119 
                     break;
120 120 
             }
 
@@ -127,9 +127,9 @@  discard block
 
 block discarded – undo
127 127 
 		$url = remove_query_arg( 'sort', $url );
128 128 
 		$multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID );
129 129
130 
-    	$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
130 
+    	$url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $url );
131 131
132 
-		return '<a href="'. esc_url_raw( $url ) .'" data-multisort-href="'. esc_url_raw( $multisort_url ) . '" class="'. $class .'" ></a>&nbsp;'. $column_label;
132 
+		return '<a href="' . esc_url_raw( $url ) . '" data-multisort-href="' . esc_url_raw( $multisort_url ) . '" class="' . $class . '" ></a>&nbsp;' . $column_label;
133 133 
 	}
134 134
135 135 
 	/**
 
@@ -160,19 +160,19 @@  discard block
 
 block discarded – undo
160 160 
         if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
161 161 
             if ( count( $keys ) ) {
162 162 
                 $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
163 
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
163 
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
164 164 
             } else {
165 
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
165 
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
166 166 
             }
167 167 
         }
168 168 
         // Otherwise, we are just updating the sort order
169 169 
         else {
170 170
171 171 
             // Pass empty value to unset
172 
-            if( '' === $sort_args[1] ) {
172 
+            if ( '' === $sort_args[ 1 ] ) {
173 173 
 	            unset( $sorts[ $field_id ] );
174 174 
             } else {
175 
-	            $sorts[ $field_id ] = $sort_args[1];
175 
+	            $sorts[ $field_id ] = $sort_args[ 1 ];
176 176 
             }
177 177
178 178 
             $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
 
@@ -310,9 +310,9 @@  discard block
 
 block discarded – undo
310 310 
                 do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
311 311
312 312 
                 foreach ( $fields->all() as $field ) {
313 
-					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
314 
-						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
315 
-							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
313 
+					if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
314 
+						if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
315 
+							$field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
316 316 
 						} else {
317 317 
 							if ( ! $field instanceof Internal_Field ) {
318 318 
 								$field = Internal_Field::from_configuration( array( 'id' => 'custom' ) );
Please login to merge, or discard this patch.