| @@ -231,18 +231,13 @@ | ||
| 231 | 231 | |
| 232 | 232 | // Terms per post |
| 233 | 233 | $post_taxonomy_term_ids[] = $slug; |
| 234 | 234 | |
| 235 | - if( !array_key_exists( $slug, $filter_terms ) ) { | |
| 236 | - // Filter terms | |
| 237 | - $filter_terms[$slug] = array( | |
| 238 | - 'taxonomy' => $taxonomy, | |
| 239 | - 'name' => $term->name, | |
| 240 | - 'count' => 1, | |
| 241 | - ); | |
| 242 | - } else { | |
| 243 | - $filter_terms[$slug]['count']++; | |
| 244 | - } | |
| 235 | + // Filter terms | |
| 236 | + $filter_terms[$slug] = array( | |
| 237 | + 'taxonomy' => $taxonomy, | |
| 238 | + 'name' => $term->name, | |
| 239 | + ); | |
| 245 | 240 | } |
| 246 | 241 | |
| 247 | 242 | $terms_per_post[$post_id][$taxonomy] = $post_taxonomy_term_ids; |
| 248 | 243 | } |
| @@ -247,41 +242,8 @@ | ||
| 247 | 242 | $terms_per_post[$post_id][$taxonomy] = $post_taxonomy_term_ids; |
| 248 | 243 | } |
| 249 | 244 | } |
| 250 | 245 | |
| 251 | - // Show Empty Terms | |
| 252 | - if( $grid->filter_show_empty() ) { | |
| 253 | - foreach( $taxonomies as $taxonomy ) { | |
| 254 | - $terms = get_terms( $taxonomy, array( | |
| 255 | - 'hide_empty' => false, | |
| 256 | - ) ); | |
| 257 | - | |
| 258 | - foreach( $terms as $term ) { | |
| 259 | - // Check if terms are being limited | |
| 260 | - if( $grid->filter_limit() ) { | |
| 261 | - if( $grid->filter_limit_exclude() ) { | |
| 262 | - if( isset( $limit_terms[$taxonomy] ) && in_array( $term->term_id, $limit_terms[$taxonomy] ) ) continue; | |
| 263 | - } else { | |
| 264 | - if( !isset( $limit_terms[$taxonomy] ) || !in_array( $term->term_id, $limit_terms[$taxonomy] ) ) continue; | |
| 265 | - } | |
| 266 | - } | |
| 267 | - | |
| 268 | - $slug = urldecode( $term->slug ); | |
| 269 | - | |
| 270 | - if( !isset( $posts_per_term[$taxonomy][$slug] ) ) $posts_per_term[$taxonomy][$slug] = array(); | |
| 271 | - | |
| 272 | - if( !array_key_exists( $slug, $filter_terms ) ) { | |
| 273 | - // Filter terms | |
| 274 | - $filter_terms[$slug] = array( | |
| 275 | - 'taxonomy' => $taxonomy, | |
| 276 | - 'name' => $term->name, | |
| 277 | - 'count' => 0, | |
| 278 | - ); | |
| 279 | - } | |
| 280 | - } | |
| 281 | - } | |
| 282 | - } | |
| 283 | - | |
| 284 | 246 | $cache['taxonomies'] = $posts_per_term; |
| 285 | 247 | $cache['terms'] = $terms_per_post; |
| 286 | 248 | |
| 287 | 249 | // Generate Filter |
| @@ -286,9 +248,9 @@ | ||
| 286 | 248 | |
| 287 | 249 | // Generate Filter |
| 288 | 250 | $filter = ''; |
| 289 | 251 | |
| 290 | - if( count( $filter_terms ) > 0 && ($grid->filter_type() == 'isotope' ) || $grid->filter_type() == 'text_isotope') { | |
| 252 | + if( count( $filter_terms ) > 0 && $grid->filter_type() == 'isotope' ) { | |
| 291 | 253 | $filter_style = $grid->filter_style(); |
| 292 | 254 | |
| 293 | 255 | // All Button |
| 294 | 256 | if( $filter_style['isotope']['all_button_text'] ) { |
| @@ -294,36 +256,10 @@ | ||
| 294 | 256 | if( $filter_style['isotope']['all_button_text'] ) { |
| 295 | 257 | $filter .= '<div class="wpupg-filter-item wpupg-filter-isotope-term wpupg-filter-tag- active">' . $filter_style['isotope']['all_button_text'] . '</div>'; |
| 296 | 258 | } |
| 297 | 259 | |
| 298 | - $filter_terms_order = array(); | |
| 299 | - | |
| 300 | - if( $filter_style['isotope']['term_order'] == 'alphabetical_taxonomies' || $filter_style['isotope']['term_order'] == 'reverse_alphabetical_taxonomies' ) { | |
| 301 | - // Order alphatically per taxonomy | |
| 302 | - $terms_per_taxonomy = array(); | |
| 303 | - | |
| 304 | - foreach( $filter_terms as $slug => $term ) { | |
| 305 | - $taxonomy = $term['taxonomy']; | |
| 306 | - if( !array_key_exists( $taxonomy, $terms_per_taxonomy ) ) { | |
| 307 | - $terms_per_taxonomy[$taxonomy] = array(); | |
| 308 | - } | |
| 309 | - $terms_per_taxonomy[$taxonomy][] = $slug; | |
| 310 | - } | |
| 311 | - | |
| 312 | - foreach( $terms_per_taxonomy as $taxonomy => $terms ) { | |
| 313 | - sort( $terms ); | |
| 314 | - $filter_terms_order = array_merge( $filter_terms_order, $terms ); | |
| 315 | - } | |
| 316 | - } else { | |
| 317 | - // Order alphabetically by default | |
| 318 | - $filter_terms_order = array_keys( $filter_terms ); | |
| 319 | - sort( $filter_terms_order ); | |
| 320 | - } | |
| 321 | - | |
| 322 | - if( $filter_style['isotope']['term_order'] == 'reverse_alphabetical_taxonomies' || $filter_style['isotope']['term_order'] == 'reverse_alphabetical' ) { | |
| 323 | - $filter_terms_order = array_reverse( $filter_terms_order ); | |
| 324 | - } | |
| 325 | - | |
| 260 | + $filter_terms_order = array_keys( $filter_terms ); | |
| 261 | + sort( $filter_terms_order ); | |
| 326 | 262 | $filter_terms_order = apply_filters( 'wpupg_grid_cache_filter_isotope_term_order', $filter_terms_order, $grid ); |
| 327 | 263 | |
| 328 | 264 | foreach( $filter_terms_order as $slug ) { |
| 329 | 265 | $options = isset( $filter_terms[$slug] ) ? $filter_terms[$slug] : false; |
| @@ -328,20 +264,10 @@ | ||
| 328 | 264 | foreach( $filter_terms_order as $slug ) { |
| 329 | 265 | $options = isset( $filter_terms[$slug] ) ? $filter_terms[$slug] : false; |
| 330 | 266 | |
| 331 | 267 | if( $options ) { |
| 332 | - if( $grid->filter_count() ) { | |
| 333 | - $name = $options['name'] . ' (' . $options['count'] . ')'; | |
| 334 | - } else { | |
| 335 | - $name = $options['name']; | |
| 336 | - } | |
| 337 | - | |
| 338 | - $filter .= '<div class="wpupg-filter-item wpupg-filter-isotope-term wpupg-filter-tag-' . $slug . '" data-taxonomy="' . $options['taxonomy'] . '" data-filter="' . $slug . '">' . $name . '</div>'; | |
| 268 | + $filter .= '<div class="wpupg-filter-item wpupg-filter-isotope-term wpupg-filter-tag-' . $slug . '" data-taxonomy="' . $options['taxonomy'] . '" data-filter="' . $slug . '">' . $options['name'] . '</div>'; | |
| 339 | 269 | } |
| 340 | - } | |
| 341 | - | |
| 342 | - if( $grid->filter_type() == 'text_isotope' && WPUltimatePostGrid::is_addon_active('filter-text') ) { | |
| 343 | - $filter .= WPUltimatePostGrid::addon('filter-text')->get_filter(); | |
| 344 | 270 | } |
| 345 | 271 | } |
| 346 | 272 | |
| 347 | 273 | // Update Metadata |
