← All changes
|
json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php
+13
-2
12.0.3
→
16.3-a.1
View file →
| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName |
| 2 | 2 | |
| 3 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 4 | + exit( 0 ); | |
| 5 | +} | |
| 6 | + | |
| 3 | 7 | new WPCOM_JSON_API_Get_Taxonomies_Endpoint( |
| 4 | 8 | array( |
| 5 | 9 | 'description' => "Get a list of a site's categories.", |
| 6 | 10 | 'group' => 'taxonomy', |
| @@ -71,8 +75,10 @@ | ||
| 71 | 75 | ); |
| 72 | 76 | |
| 73 | 77 | /** |
| 74 | 78 | * GET taxonomies endpoint class. |
| 79 | + * | |
| 80 | + * @phan-constructor-used-for-side-effects | |
| 75 | 81 | */ |
| 76 | 82 | class WPCOM_JSON_API_Get_Taxonomies_Endpoint extends WPCOM_JSON_API_Endpoint { |
| 77 | 83 | /** |
| 78 | 84 | * |
| @@ -90,8 +96,11 @@ | ||
| 90 | 96 | } |
| 91 | 97 | |
| 92 | 98 | $args = $this->query_args(); |
| 93 | 99 | $args = $this->process_args( $args ); |
| 100 | + if ( is_wp_error( $args ) ) { | |
| 101 | + return $args; | |
| 102 | + } | |
| 94 | 103 | |
| 95 | 104 | if ( preg_match( '#/tags#i', $path ) ) { |
| 96 | 105 | return $this->tags( $args ); |
| 97 | 106 | } else { |
| @@ -140,9 +149,10 @@ | ||
| 140 | 149 | $args['get'] = 'all'; |
| 141 | 150 | |
| 142 | 151 | $cats = get_categories( $args ); |
| 143 | 152 | unset( $args['offset'] ); |
| 144 | - $found = wp_count_terms( 'category', $args ); | |
| 153 | + $args['taxonomy'] = 'category'; | |
| 154 | + $found = wp_count_terms( $args ); | |
| 145 | 155 | |
| 146 | 156 | $cats_obj = array(); |
| 147 | 157 | foreach ( $cats as $cat ) { |
| 148 | 158 | $cats_obj[] = $this->format_taxonomy( $cat, 'category', 'display' ); |
| @@ -163,9 +173,10 @@ | ||
| 163 | 173 | $args['get'] = 'all'; |
| 164 | 174 | |
| 165 | 175 | $tags = (array) get_tags( $args ); |
| 166 | 176 | unset( $args['offset'] ); |
| 167 | - $found = wp_count_terms( 'post_tag', $args ); | |
| 177 | + $args['taxonomy'] = 'post_tag'; | |
| 178 | + $found = wp_count_terms( $args ); | |
| 168 | 179 | |
| 169 | 180 | $tags_obj = array(); |
| 170 | 181 | foreach ( $tags as $tag ) { |
| 171 | 182 | $tags_obj[] = $this->format_taxonomy( $tag, 'post_tag', 'display' ); |