Merge pull request #148 from devgeniem/taxonomy-archives

Fix taxonomy archives

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+- Fix archive pages for custom taxonomies when filtering with another taxonomy.
+- Fix a variable typo
 ## [1.34.0] - 2021-06-10
 
 ### Changed

dustpress.php

@@ -458,14 +458,14 @@ private function get_template_filename( &$debugs = array() ) {
         }
 
         if ( is_tax() ) {
-            $term_id = get_queried_object()->term_id;
-            $term = get_term_by( 'id', $term_id, get_query_var( 'taxonomy' ) );
+
+            $term = get_queried_object();
 
             $hierarchy[ 'is_tax' ] = [
-                'Taxonomy' . $this->dashed_to_camelcase( get_query_var( 'taxonomy' ), '_' ) . $this->dashed_to_camelcase( $term->slug ),
-                'Taxonomy' . $this->dashed_to_camelcase( get_query_var( 'taxonomy' ) ) . $this->dashed_to_camelcase( $term->slug ),
-                'Taxonomy' . $this->dashed_to_camelcase( get_query_var( 'taxonomy' ), '_' ),
-                'Taxonomy' . $this->dashed_to_camelcase( get_query_var( 'taxonomy' ) ),
+                'Taxonomy' . $this->dashed_to_camelcase( $term->taxonomy, '_' ) . $this->dashed_to_camelcase( $term->slug ),
+                'Taxonomy' . $this->dashed_to_camelcase( $term->taxonomy ) . $this->dashed_to_camelcase( $term->slug ),
+                'Taxonomy' . $this->dashed_to_camelcase( $term->taxonomy, '_' ),
+                'Taxonomy' . $this->dashed_to_camelcase( $term->taxonomy ),
                 'Taxonomy',
                 'Archive'
             ];
@@ -490,7 +490,7 @@ private function get_template_filename( &$debugs = array() ) {
         if ( is_attachment() ) {
             $mime_type = get_post_mime_type( get_the_ID() );
 
-            $hiearchy[ 'is_attachment' ] = [
+            $hierarchy[ 'is_attachment' ] = [
                 function() use ( $mime_type ) {
                     if ( preg_match( '/^image/', $mime_type ) && class_exists( 'Image' ) ) {
                         return 'Image';