Changeset 39029

Timestamp:

10/30/2016 05:53:04 PM (8 years ago)

Author:

DrewAPicture

Message:

REST: Fix some errant else if conditions and add a few missing periods on inline comments.

Props mrahmadawais.
See #38398.

File:

• trunk/src/wp-includes/rest-api/class-wp-rest-server.php (modified) (7 diffs)

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -115 +115 @@
     public function check_authentication() {
         /**
-         * Pass an authentication error to the API
+         * Filters REST authentication errors.
          *
          * This is used to pass a WP_Error from an authentication method back to
@@ -392 +392 @@
 
             if ( $jsonp_callback ) {
-                // Prepend '/**/' to mitigate possible JSONP Flash attacks
+                // Prepend '/**/' to mitigate possible JSONP Flash attacks.
                 // https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
                 echo '/**/' . $jsonp_callback . '(' . $result . ')';
@@ -503 +503 @@
                 }
 
-                // Relation now changes from '$uri' to '$curie:$relation'
+                // Relation now changes from '$uri' to '$curie:$relation'.
                 $rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) );
                 preg_match( '!' . $rel_regex . '!', $rel, $matches );
@@ -583 +583 @@
             // Determine if any real links were found.
             $has_links = count( array_filter( $embeds ) );
+
             if ( $has_links ) {
                 $embedded[ $rel ] = $embeds;
@@ -742 +743 @@
                 if ( is_string( $handler['methods'] ) ) {
                     $methods = explode( ',', $handler['methods'] );
-                } else if ( is_array( $handler['methods'] ) ) {
+                } elseif ( is_array( $handler['methods'] ) ) {
                     $methods = $handler['methods'];
                 } else {
@@ -756 +757 @@
             }
         }
+
         return $endpoints;
     }
@@ -897 +899 @@
                         if ( is_wp_error( $permission ) ) {
                             $response = $permission;
-                        } else if ( false === $permission || null === $permission ) {
+                        } elseif ( false === $permission || null === $permission ) {
                             $response = new WP_Error( 'rest_forbidden', __( 'Sorry, you are not allowed to do that.' ), array( 'status' => 403 ) );
                         }