Merge branch 'master' into patch-1

rodrigobb · web-flow · commit 04855af97d3f · 2019-03-07T12:35:26.000+01:00
diff --git a/extending-the-rest-api/adding-rest-api-support-for-custom-content-types.md b/extending-the-rest-api/adding-rest-api-support-for-custom-content-types.md
@@ -128,55 +128,52 @@ function my_book_taxonomy() {
 ```
 
 ## Adding REST API Support To Existing Content Types
-When a custom post type or custom taxonomy has been added by code that you do not control, for example a theme or plugin you are using, you may need to add REST API support after it has already been registered. The arguments are the same as in the previous examples, but need to be added to the global `$wp_post_types` and `$wp_taxonomies` arrays.
 
-Here is an example of adding REST API support to an existing custom post type:
+If you need to add REST API support for a custom post type or custom taxonomy you do not control, for example a theme or plugin you are using, you can use the `register_post_type_args` filter hook that exists since WordPress version 4.6.0.
 
 ```php
 /**
  * Add REST API support to an already registered post type.
  */
-add_action( 'init', 'my_custom_post_type_rest_support', 25 );
-function my_custom_post_type_rest_support() {
-  global $wp_post_types;
-
-  //be sure to set this to the name of your post type!
-  $post_type_name = 'planet';
-  if( isset( $wp_post_types[ $post_type_name ] ) ) {
-    $wp_post_types[$post_type_name]->show_in_rest = true;
-    // Optionally customize the rest_base or controller class
-    $wp_post_types[$post_type_name]->rest_base = $post_type_name;
-    $wp_post_types[$post_type_name]->rest_controller_class = 'WP_REST_Posts_Controller';
-  }
+add_filter( 'register_post_type_args', 'my_post_type_args', 10, 2 );
+
+function my_post_type_args( $args, $post_type ) {
+
+	if ( 'book' === $post_type ) {
+		$args['show_in_rest'] = true;
+
+		// Optionally customize the rest_base or rest_controller_class
+		$args['rest_base']             = 'books';
+		$args['rest_controller_class'] = 'WP_REST_Posts_Controller';
+	}
+
+	return $args;
 }
 ```
 
-Here is an example of how to add REST API support to an already registered custom taxonomy.
+
+For custom taxnomies it is almost the same. You can use the `register_taxonomy_args` filter that exists since WordPress version 4.4.0. 
 
 ```php
 /**
  * Add REST API support to an already registered taxonomy.
  */
-add_action( 'init', 'my_custom_taxonomy_rest_support', 25 );
-function my_custom_taxonomy_rest_support() {
-  global $wp_taxonomies;
+add_filter( 'register_taxonomy_args', 'my_taxonomy_args', 10, 2 );
+
+function my_taxonomy_args( $args, $taxonomy_name ) {
 
-  //be sure to set this to the name of your taxonomy!
-  $taxonomy_name = 'planet_class';
+	if ( 'genre' === $taxonomy_name ) {
+		$args['show_in_rest'] = true;
 
-  if ( isset( $wp_taxonomies[ $taxonomy_name ] ) ) {
-    $wp_taxonomies[ $taxonomy_name ]->show_in_rest = true;
+		// Optionally customize the rest_base or rest_controller_class
+		$args['rest_base']             = 'genres';
+		$args['rest_controller_class'] = 'WP_REST_Terms_Controller';
+	}
 
-    // Optionally customize the rest_base or controller class
-    $wp_taxonomies[ $taxonomy_name ]->rest_base = $taxonomy_name;
-    $wp_taxonomies[ $taxonomy_name ]->rest_controller_class = 'WP_REST_Terms_Controller';
-  }
+	return $args;
 }
 ```
 
-If you are having trouble implementing either of these examples, be sure that you are adding these hooks with a sufficiently high priority. If the callback functions run before the post type or taxonomy is registered, then the `isset` check will prevent an error, but the support will not be added.
-
-
 ## Custom Link Relationships
 
 Taxonomies & custom post types have a built-in association within WordPress, but what if you want to establish a link between two custom post types? This is not supported formally within WordPress itself, but we can create our own connections between arbitrary content types using the `_link` relation.
diff --git a/index.md b/index.md
@@ -33,8 +33,8 @@ Each of these concepts play a crucial role in using and understanding the WordPr
 
 A route, in the context of the WordPress REST API, is a URI which can be mapped to different HTTP methods. The mapping of an individual HTTP method to a route is known as an "endpoint". To clarify: If we make a `GET` request to `http://oursite.com/wp-json/`, we will get a JSON response showing us what routes are available, and within each route, what endpoints are available. `/wp-json/` is a route itself and when a `GET` request is made it matches to the endpoint that displays what is known as the index for the WordPress REST API. We will learn how to register our own routes and endpoints in the following sections.
 
-If you get a `404` error when trying to access `http://oursite.com/wp-json/` URL you may try fixing your pretty permalinks. If you are using default permalinks (query params) you can access the API at `?rest_route=/`, for example `http://oursite.com/?rest_route=/`. 
-
+If you get a `404` error when trying to access `http://oursite.com/wp-json/` URL you may try fixing your pretty permalinks.
+[info] If you're using [non-pretty permalinks](https://codex.wordpress.org/Using_Permalinks), you should pass the REST API route as a query string parameter (with `?rest_route=/`, for example `http://oursite.com/?rest_route=/`). The route `http://oursite.com/wp-json/` in the example above would hence be  `http://oursite.com/?rest_route=/`.[/info]
 
 ### Requests
 
diff --git a/using-the-rest-api/authentication.md b/using-the-rest-api/authentication.md
@@ -53,7 +53,7 @@ $.ajax( {
 } );
 ```
 
-Note that you do not need to verify that the nonce in valid inside your custom end point. This is automatically done for you in 
+Note that you do not need to verify that the nonce is valid inside your custom end point. This is automatically done for you in 
 `rest_cookie_check_errors()`
 
 ## Authentication Plugins
diff --git a/using-the-rest-api/frequently-asked-questions.md b/using-the-rest-api/frequently-asked-questions.md
@@ -5,7 +5,7 @@ This page provides solutions to some common questions and problems that may aris
 
 ## Can I disable the REST API?
 
-You should not disable the REST API, because doing so would break future WordPress Admin functionality that will depend on the API being active. However, you may use a filter to require that API consumers be authenticated, which effectively prevents anonymous external access. See below for more information.
+You should not disable the REST API, because doing so will break WordPress Admin functionality that depends on the API being active. However, you may use a filter to require that API consumers be authenticated, which effectively prevents anonymous external access. See below for more information.
 
 
 ## Require Authentication for All Reque&#8203;sts
