| @@ -178,28 +178,23 @@ | ||
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | 180 | * PARSE ORDER PARAMS |
| 181 | 181 | */ |
| 182 | + $order = esc_sql( $args['order'] ); | |
| 183 | + $orderby = esc_sql( $args['orderby'] ); | |
| 182 | 184 | $orderable = array( 'ID', 'site_id', 'blog_id', 'object_id', 'user_id', 'user_role', 'summary', 'created', 'connector', 'context', 'action' ); |
| 183 | 185 | |
| 184 | - // Default to sorting by record ID. | |
| 185 | - $orderby = "$wpdb->stream.ID"; | |
| 186 | - | |
| 187 | - if ( in_array( $args['orderby'], $orderable, true ) ) { | |
| 188 | - $orderby = sprintf( '%s.%s', $wpdb->stream, $args['orderby'] ); | |
| 189 | - } elseif ( 'meta_value_num' === $args['orderby'] && ! empty( $args['meta_key'] ) ) { | |
| 186 | + if ( in_array( $orderby, $orderable, true ) ) { | |
| 187 | + $orderby = sprintf( '%s.%s', $wpdb->stream, $orderby ); | |
| 188 | + } elseif ( 'meta_value_num' === $orderby && ! empty( $args['meta_key'] ) ) { | |
| 190 | 189 | $orderby = "CAST($wpdb->streammeta.meta_value AS SIGNED)"; |
| 191 | - } elseif ( 'meta_value' === $args['orderby'] && ! empty( $args['meta_key'] ) ) { | |
| 190 | + } elseif ( 'meta_value' === $orderby && ! empty( $args['meta_key'] ) ) { | |
| 192 | 191 | $orderby = "$wpdb->streammeta.meta_value"; |
| 192 | + } else { | |
| 193 | + $orderby = "$wpdb->stream.ID"; | |
| 193 | 194 | } |
| 194 | 195 | |
| 195 | - // Show the recent records first by default. | |
| 196 | - $order = 'DESC'; | |
| 197 | - if ( 'ASC' === strtoupper( $args['order'] ) ) { | |
| 198 | - $order = 'ASC'; | |
| 199 | - } | |
| 200 | - | |
| 201 | - $orderby = sprintf( 'ORDER BY %s %s', $orderby, $order ); | |
| 196 | + $orderby = "ORDER BY {$orderby} {$order}"; | |
| 202 | 197 | |
| 203 | 198 | /** |
| 204 | 199 | * PARSE FIELDS PARAMETER |
| 205 | 200 | */ |
