← All changes
|
jetpack_vendor/automattic/jetpack-jitm/src/class-rest-api-endpoints.php
+13
-7
12.4.2
→
16.3-beta
View file →
| @@ -7,10 +7,16 @@ | ||
| 7 | 7 | |
| 8 | 8 | namespace Automattic\Jetpack\JITMS; |
| 9 | 9 | |
| 10 | 10 | use Automattic\Jetpack\Connection\REST_Connector; |
| 11 | +use WP_Error; | |
| 12 | +use WP_REST_Request; | |
| 11 | 13 | use WP_REST_Server; |
| 12 | 14 | |
| 15 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 16 | + exit( 0 ); | |
| 17 | +} | |
| 18 | + | |
| 13 | 19 | /** |
| 14 | 20 | * Register the JITM's REST API Endpoints and their callbacks. |
| 15 | 21 | */ |
| 16 | 22 | class Rest_Api_Endpoints { |
| @@ -54,15 +60,16 @@ | ||
| 54 | 60 | if ( ! $jitm->jitms_enabled() ) { |
| 55 | 61 | return array(); |
| 56 | 62 | } |
| 57 | 63 | |
| 58 | - // add the search term to the query params if it exists | |
| 59 | - $query = $request['query']; | |
| 60 | - if ( ! empty( $request['s'] ) ) { | |
| 61 | - $query['s'] = $request['s']; | |
| 64 | + $query_string = $request['query'] ?? ''; | |
| 65 | + $query_array = array(); | |
| 66 | + if ( ! empty( $query_string ) ) { | |
| 67 | + parse_str( $query_string, $query_array ); | |
| 68 | + $query_array = urldecode_deep( $query_array ); | |
| 62 | 69 | } |
| 63 | 70 | |
| 64 | - return $jitm->get_messages( $request['message_path'], urldecode_deep( $query ), 'true' === $request['full_jp_logo_exists'] ? true : false ); | |
| 71 | + return $jitm->get_messages( $request['message_path'], $query_array, 'true' === $request['full_jp_logo_exists'] ); | |
| 65 | 72 | } |
| 66 | 73 | |
| 67 | 74 | /** |
| 68 | 75 | * Dismisses a jitm. |
| @@ -90,8 +97,7 @@ | ||
| 90 | 97 | if ( current_user_can( 'read' ) ) { |
| 91 | 98 | return true; |
| 92 | 99 | } |
| 93 | 100 | |
| 94 | - return new \WP_Error( 'invalid_user_permission_jetpack_delete_jitm_message', REST_Connector::get_user_permissions_error_msg(), array( 'status' => rest_authorization_required_code() ) ); | |
| 101 | + return new WP_Error( 'invalid_user_permission_jetpack_delete_jitm_message', REST_Connector::get_user_permissions_error_msg(), array( 'status' => rest_authorization_required_code() ) ); | |
| 95 | 102 | } |
| 96 | - | |
| 97 | 103 | } |