Changeset 39287

Timestamp:

11/18/16 16:21:27 (9 months ago)

Author:

rachelbaker

Message:

REST API: On comment create, fallback to the user_agent header value.

If a user-agent is not explicitly provided in the author_user_agent parameter, fallback to the user_agent value in the request header.

Props dd32, jnylen0, rachelbaker.
Fixes #38817.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-comments-controller.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -1042 +1042 @@
         }
 
-        if ( isset( $request['author_user_agent'] ) ) {
+        if ( ! empty( $request['author_user_agent'] ) ) {
             $prepared_comment['comment_agent'] = $request['author_user_agent'];
+        } elseif ( $request->get_header( 'user_agent' ) ) {
+            $prepared_comment['comment_agent'] = $request->get_header( 'user_agent' );
         }
 

trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -1245 +1245 @@
         $this->assertEquals( '139.130.4.5', $data['author_ip'] );
         $this->assertEquals( 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36', $data['author_user_agent'] );
+    }
+
+    public function test_create_comment_user_agent_header() {
+        wp_set_current_user( self::$admin_id );
+
+        $params = array(
+            'post'         => self::$post_id,
+            'author_name'  => 'Homer Jay Simpson',
+            'author_email' => 'chunkylover53@aol.com',
+            'author_url'   => 'http://compuglobalhypermeganet.com',
+            'content'      => 'Here\’s to alcohol: the cause of, and solution to, all of life\’s problems.',
+        );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
+        $request->add_header( 'content-type', 'application/json' );
+        $request->add_header( 'user_agent', 'Mozilla/4.0 (compatible; MSIE 5.5; AOL 4.0; Windows 95)' );
+        $request->set_body( wp_json_encode( $params ) );
+
+        $response = $this->server->dispatch( $request );
+        $this->assertEquals( 201, $response->get_status() );
+
+        $data = $response->get_data();
+
+        $new_comment = get_comment( $data['id'] );
+        $this->assertEquals( 'Mozilla/4.0 (compatible; MSIE 5.5; AOL 4.0; Windows 95)', $new_comment->comment_agent );
     }