Merge pull request #2812 from Soean/patch-1

rmccue · web-flow · commit e0fdc5fdb976 · 2016-10-14T13:04:13.000+13:00
Missing full-stop in error message
diff --git a/lib/endpoints/class-wp-rest-attachments-controller.php b/lib/endpoints/class-wp-rest-attachments-controller.php
@@ -371,15 +371,15 @@ public function get_item_schema() {
 	 */
 	protected function upload_from_data( $data, $headers ) {
 		if ( empty( $data ) ) {
-			return new WP_Error( 'rest_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );
+			return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );
 		}
 
 		if ( empty( $headers['content_type'] ) ) {
-			return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied' ), array( 'status' => 400 ) );
+			return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied.' ), array( 'status' => 400 ) );
 		}
 
 		if ( empty( $headers['content_disposition'] ) ) {
-			return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied' ), array( 'status' => 400 ) );
+			return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied.' ), array( 'status' => 400 ) );
 		}
 
 		$filename = $this->get_filename_from_disposition( $headers['content_disposition'] );
@@ -394,7 +394,7 @@ protected function upload_from_data( $data, $headers ) {
 			$actual   = md5( $data );
 
 			if ( $expected !== $actual ) {
-				return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );
+				return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );
 			}
 		}
 
@@ -410,7 +410,7 @@ protected function upload_from_data( $data, $headers ) {
 		$fp = fopen( $tmpfname, 'w+' );
 
 		if ( ! $fp ) {
-			return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle' ), array( 'status' => 500 ) );
+			return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle.' ), array( 'status' => 500 ) );
 		}
 
 		fwrite( $fp, $data );
@@ -552,7 +552,7 @@ public function validate_user_can_query_private_statuses( $value, $request, $par
 	 */
 	protected function upload_from_file( $files, $headers ) {
 		if ( empty( $files ) ) {
-			return new WP_Error( 'rest_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );
+			return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );
 		}
 
 		// Verify hash, if given
@@ -561,7 +561,7 @@ protected function upload_from_file( $files, $headers ) {
 			$expected = trim( $content_md5 );
 			$actual = md5_file( $files['file']['tmp_name'] );
 			if ( $expected !== $actual ) {
-				return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );
+				return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );
 			}
 		}
 
diff --git a/lib/endpoints/class-wp-rest-comments-controller.php b/lib/endpoints/class-wp-rest-comments-controller.php
@@ -296,7 +296,7 @@ public function create_item_permissions_check( $request ) {
 		}
 
 		if ( empty( $request['post'] ) && ! current_user_can( 'moderate_comments' ) ) {
-			return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you cannot create this comment without a post' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you cannot create this comment without a post.' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		if ( ! empty( $request['post'] ) && $post = $this->get_post( (int) $request['post'] ) ) {
diff --git a/lib/endpoints/class-wp-rest-posts-controller.php b/lib/endpoints/class-wp-rest-posts-controller.php
@@ -77,7 +77,7 @@ public function get_items_permissions_check( $request ) {
 		$post_type = get_post_type_object( $this->post_type );
 
 		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit these posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit these posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		return true;
@@ -271,7 +271,7 @@ public function get_item_permissions_check( $request ) {
 		$post = $this->get_post( (int) $request['id'] );
 
 		if ( 'edit' === $request['context'] && $post && ! $this->check_update_permission( $post ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		if ( $post && ! empty( $request['password'] ) ) {
@@ -948,13 +948,13 @@ protected function handle_status_param( $post_status, $post_type ) {
 				break;
 			case 'private':
 				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
-					return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );
+					return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );
 				}
 				break;
 			case 'publish':
 			case 'future':
 				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
-					return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );
+					return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );
 				}
 				break;
 			default:
@@ -1917,6 +1917,6 @@ public function validate_user_can_query_private_statuses( $value, $request, $par
 		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
 			return true;
 		}
-		return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden' ), array( 'status' => rest_authorization_required_code() ) );
+		return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) );
 	}
 }
diff --git a/lib/endpoints/class-wp-rest-users-controller.php b/lib/endpoints/class-wp-rest-users-controller.php
@@ -401,7 +401,7 @@ public function update_item( $request ) {
 		}
 
 		if ( ! empty( $request['username'] ) && $request['username'] !== $user->user_login ) {
-			return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable" ), array( 'status' => 400 ) );
+			return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable." ), array( 'status' => 400 ) );
 		}
 
 		if ( ! empty( $request['slug'] ) && $request['slug'] !== $user->user_nicename && get_user_by( 'slug', $request['slug'] ) ) {
diff --git a/plugin.php b/plugin.php
@@ -226,7 +226,7 @@ function rest_register_settings() {
 			),
 		),
 		'type'         => 'string',
-		'description'  => __( 'Site URL' ),
+		'description'  => __( 'Site URL.' ),
 	) );
 
 	register_setting( 'general', 'admin_email', array(

Original file line number	Diff line number	Diff line change
`@@ -371,15 +371,15 @@ public function get_item_schema() {`
`371`	`371`	`*/`
`372`	`372`	`protected function upload_from_data( $data, $headers ) {`
`373`	`373`	`if ( empty( $data ) ) {`
`374`		`- return new WP_Error( 'rest_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );`
	`374`	`+ return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`if ( empty( $headers['content_type'] ) ) {`
`378`		`- return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied' ), array( 'status' => 400 ) );`
	`378`	`+ return new WP_Error( 'rest_upload_no_content_type', __( 'No Content-Type supplied.' ), array( 'status' => 400 ) );`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`if ( empty( $headers['content_disposition'] ) ) {`
`382`		`- return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied' ), array( 'status' => 400 ) );`
	`382`	`+ return new WP_Error( 'rest_upload_no_content_disposition', __( 'No Content-Disposition supplied.' ), array( 'status' => 400 ) );`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`$filename = $this->get_filename_from_disposition( $headers['content_disposition'] );`
`@@ -394,7 +394,7 @@ protected function upload_from_data( $data, $headers ) {`
`394`	`394`	`$actual = md5( $data );`
`395`	`395`
`396`	`396`	`if ( $expected !== $actual ) {`
`397`		`- return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );`
	`397`	`+ return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`
`@@ -410,7 +410,7 @@ protected function upload_from_data( $data, $headers ) {`
`410`	`410`	`$fp = fopen( $tmpfname, 'w+' );`
`411`	`411`
`412`	`412`	`if ( ! $fp ) {`
`413`		`- return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle' ), array( 'status' => 500 ) );`
	`413`	`+ return new WP_Error( 'rest_upload_file_error', __( 'Could not open file handle.' ), array( 'status' => 500 ) );`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`fwrite( $fp, $data );`
`@@ -552,7 +552,7 @@ public function validate_user_can_query_private_statuses( $value, $request, $par`
`552`	`552`	`*/`
`553`	`553`	`protected function upload_from_file( $files, $headers ) {`
`554`	`554`	`if ( empty( $files ) ) {`
`555`		`- return new WP_Error( 'rest_upload_no_data', __( 'No data supplied' ), array( 'status' => 400 ) );`
	`555`	`+ return new WP_Error( 'rest_upload_no_data', __( 'No data supplied.' ), array( 'status' => 400 ) );`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`// Verify hash, if given`
`@@ -561,7 +561,7 @@ protected function upload_from_file( $files, $headers ) {`
`561`	`561`	`$expected = trim( $content_md5 );`
`562`	`562`	`$actual = md5_file( $files['file']['tmp_name'] );`
`563`	`563`	`if ( $expected !== $actual ) {`
`564`		`- return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected' ), array( 'status' => 412 ) );`
	`564`	`+ return new WP_Error( 'rest_upload_hash_mismatch', __( 'Content hash did not match expected.' ), array( 'status' => 412 ) );`
`565`	`565`	`}`
`566`	`566`	`}`
`567`	`567`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public function create_item_permissions_check( $request ) {`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`if ( empty( $request['post'] ) && ! current_user_can( 'moderate_comments' ) ) {`
`299`		`- return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you cannot create this comment without a post' ), array( 'status' => rest_authorization_required_code() ) );`
	`299`	`+ return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you cannot create this comment without a post.' ), array( 'status' => rest_authorization_required_code() ) );`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`if ( ! empty( $request['post'] ) && $post = $this->get_post( (int) $request['post'] ) ) {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function get_items_permissions_check( $request ) {`
`77`	`77`	`$post_type = get_post_type_object( $this->post_type );`
`78`	`78`
`79`	`79`	`if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {`
`80`		`- return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit these posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );`
	`80`	`+ return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit these posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return true;`
`@@ -271,7 +271,7 @@ public function get_item_permissions_check( $request ) {`
`271`	`271`	`$post = $this->get_post( (int) $request['id'] );`
`272`	`272`
`273`	`273`	`if ( 'edit' === $request['context'] && $post && ! $this->check_update_permission( $post ) ) {`
`274`		`- return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post' ), array( 'status' => rest_authorization_required_code() ) );`
	`274`	`+ return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this post.' ), array( 'status' => rest_authorization_required_code() ) );`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`if ( $post && ! empty( $request['password'] ) ) {`
`@@ -948,13 +948,13 @@ protected function handle_status_param( $post_status, $post_type ) {`
`948`	`948`	`break;`
`949`	`949`	`case 'private':`
`950`	`950`	`if ( ! current_user_can( $post_type->cap->publish_posts ) ) {`
`951`		`- return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );`
	`951`	`+ return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to create private posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );`
`952`	`952`	`}`
`953`	`953`	`break;`
`954`	`954`	`case 'publish':`
`955`	`955`	`case 'future':`
`956`	`956`	`if ( ! current_user_can( $post_type->cap->publish_posts ) ) {`
`957`		`- return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type' ), array( 'status' => rest_authorization_required_code() ) );`
	`957`	`+ return new WP_Error( 'rest_cannot_publish', __( 'Sorry, you are not allowed to publish posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );`
`958`	`958`	`}`
`959`	`959`	`break;`
`960`	`960`	`default:`
`@@ -1917,6 +1917,6 @@ public function validate_user_can_query_private_statuses( $value, $request, $par`
`1917`	`1917`	`if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {`
`1918`	`1918`	`return true;`
`1919`	`1919`	`}`
`1920`		`- return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden' ), array( 'status' => rest_authorization_required_code() ) );`
	`1920`	`+ return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) );`
`1921`	`1921`	`}`
`1922`	`1922`	`}`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ public function update_item( $request ) {`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`if ( ! empty( $request['username'] ) && $request['username'] !== $user->user_login ) {`
`404`		`- return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable" ), array( 'status' => 400 ) );`
	`404`	`+ return new WP_Error( 'rest_user_invalid_argument', __( "Username isn't editable." ), array( 'status' => 400 ) );`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`if ( ! empty( $request['slug'] ) && $request['slug'] !== $user->user_nicename && get_user_by( 'slug', $request['slug'] ) ) {`