@@ -96,24 +96,24 @@ |
||
| 96 | 96 | */ |
| 97 | 97 | private function resolver() |
| 98 | 98 | { |
| 99 | - if (is_embed() && $resolver = Resolver::TYPE_EMBED) : |
|
| 100 | - elseif (is_404() && $resolver = Resolver::TYPE_404) : |
|
| 101 | - elseif (is_search() && $resolver = Resolver::TYPE_SEARCH) : |
|
| 102 | - elseif (is_front_page() && $resolver = Resolver::TYPE_FRONT) : |
|
| 103 | - elseif (is_home() && $resolver = Resolver::TYPE_HOME) : |
|
| 104 | - elseif (is_post_type_archive() && $resolver = Resolver::TYPE_POST_ARCHIVE) : |
|
| 105 | - elseif (is_tax() && $resolver = Resolver::TYPE_TAXONOMY) : |
|
| 106 | - elseif (is_attachment() && $resolver = Resolver::TYPE_ATTACHMENT) : |
|
| 99 | + if (is_embed() && $resolver = Resolver::TYPE_EMBED) : |
|
| 100 | + elseif (is_404() && $resolver = Resolver::TYPE_404) : |
|
| 101 | + elseif (is_search() && $resolver = Resolver::TYPE_SEARCH) : |
|
| 102 | + elseif (is_front_page() && $resolver = Resolver::TYPE_FRONT) : |
|
| 103 | + elseif (is_home() && $resolver = Resolver::TYPE_HOME) : |
|
| 104 | + elseif (is_post_type_archive() && $resolver = Resolver::TYPE_POST_ARCHIVE) : |
|
| 105 | + elseif (is_tax() && $resolver = Resolver::TYPE_TAXONOMY) : |
|
| 106 | + elseif (is_attachment() && $resolver = Resolver::TYPE_ATTACHMENT) : |
|
| 107 | 107 | remove_filter('the_content', 'prepend_attachment'); |
| 108 | - elseif (is_single() && $resolver = Resolver::TYPE_SINGLE) : |
|
| 109 | - elseif (is_page() && $resolver = Resolver::TYPE_PAGE) : |
|
| 110 | - elseif (is_singular() && $resolver = Resolver::TYPE_SINGULAR) : |
|
| 111 | - elseif (is_category() && $resolver = Resolver::TYPE_CATEGORY) : |
|
| 112 | - elseif (is_tag() && $resolver = Resolver::TYPE_TAG) : |
|
| 113 | - elseif (is_author() && $resolver = Resolver::TYPE_AUTHOR) : |
|
| 114 | - elseif (is_date() && $resolver = Resolver::TYPE_DATE) : |
|
| 115 | - elseif (is_archive() && $resolver = Resolver::TYPE_ARCHIVE) : |
|
| 116 | - elseif (is_paged() && $resolver = Resolver::TYPE_PAGED) : |
|
| 108 | + elseif (is_single() && $resolver = Resolver::TYPE_SINGLE) : |
|
| 109 | + elseif (is_page() && $resolver = Resolver::TYPE_PAGE) : |
|
| 110 | + elseif (is_singular() && $resolver = Resolver::TYPE_SINGULAR) : |
|
| 111 | + elseif (is_category() && $resolver = Resolver::TYPE_CATEGORY) : |
|
| 112 | + elseif (is_tag() && $resolver = Resolver::TYPE_TAG) : |
|
| 113 | + elseif (is_author() && $resolver = Resolver::TYPE_AUTHOR) : |
|
| 114 | + elseif (is_date() && $resolver = Resolver::TYPE_DATE) : |
|
| 115 | + elseif (is_archive() && $resolver = Resolver::TYPE_ARCHIVE) : |
|
| 116 | + elseif (is_paged() && $resolver = Resolver::TYPE_PAGED) : |
|
| 117 | 117 | else : |
| 118 | 118 | $resolver = Resolver::TYPE_INDEX; |
| 119 | 119 | endif; |
@@ -98,8 +98,10 @@ |
||
| 98 | 98 | elseif (is_archive() && $resolver = ResolverInterface::TYPE_ARCHIVE) : |
| 99 | 99 | elseif (is_comments_popup() && $resolver = get_comments_popup_template()) : |
| 100 | 100 | elseif (is_paged() && $resolver = get_paged_template()) : |
| 101 | - else : |
|
| 101 | + else { |
|
| 102 | + : |
|
| 102 | 103 | $resolver = ResolverInterface::TYPE_INDEX; |
| 104 | + } |
|
| 103 | 105 | endif; |
| 104 | 106 | |
| 105 | 107 | return $resolver; |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | use LIN3S\WPRouting\Resolvers\HomeResolver; |
| 22 | 22 | use LIN3S\WPRouting\Resolvers\IndexResolver; |
| 23 | 23 | use LIN3S\WPRouting\Resolvers\NotFoundResolver; |
| 24 | -use LIN3S\WPRouting\Resolvers\PagedResolver; |
|
| 25 | 24 | use LIN3S\WPRouting\Resolvers\PageResolver; |
| 25 | +use LIN3S\WPRouting\Resolvers\PagedResolver; |
|
| 26 | 26 | use LIN3S\WPRouting\Resolvers\PostArchiveResolver; |
| 27 | 27 | use LIN3S\WPRouting\Resolvers\Resolver; |
| 28 | 28 | use LIN3S\WPRouting\Resolvers\SearchResolver; |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | public function resolve(RouteRegistry $routes) |
| 34 | 34 | { |
| 35 | - $postTypes = array_filter((array)get_query_var('post_type')); |
|
| 35 | + $postTypes = array_filter((array) get_query_var('post_type')); |
|
| 36 | 36 | |
| 37 | 37 | if (count($postTypes) === 1) { |
| 38 | 38 | $postType = reset($postTypes); |