From 5b70a0fe64d4a97b8b3f2f9c7d21f134099a820a Mon Sep 17 00:00:00 2001 From: Irshad Ahmad Date: Wed, 21 Feb 2024 21:58:42 +0530 Subject: [PATCH 1/3] WP Telegram | Allow partial input in REST API requests --- plugins/wptelegram/src/modules/p2tg/PostSender.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/wptelegram/src/modules/p2tg/PostSender.php b/plugins/wptelegram/src/modules/p2tg/PostSender.php index 0a238ccc..4f35378e 100644 --- a/plugins/wptelegram/src/modules/p2tg/PostSender.php +++ b/plugins/wptelegram/src/modules/p2tg/PostSender.php @@ -147,10 +147,13 @@ public function set_form_data() { $data = $body[ Main::PREFIX ]; $form_data = MainUtils::sanitize( $data ); - // Sanitize the template separately. - $form_data['message_template'] = MainUtils::sanitize_message_template( $data['message_template'] ); - $form_data['send2tg'] = $form_data['send2tg'] ? 'yes' : 'no'; + if ( isset( $data['message_template'] ) ) { + // Sanitize the template separately. + $form_data['message_template'] = MainUtils::sanitize_message_template( $data['message_template'] ); + } + + $form_data['send2tg'] = ! empty( $form_data['send2tg'] ) ? 'yes' : 'no'; $this->form_data = $form_data; // For logging. From 85ee3d542fb2821946dcb5613cdd0794295e8a50 Mon Sep 17 00:00:00 2001 From: Irshad Ahmad Date: Wed, 21 Feb 2024 21:59:32 +0530 Subject: [PATCH 2/3] Add changeset --- .changeset/mighty-fishes-hammer.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/mighty-fishes-hammer.md diff --git a/.changeset/mighty-fishes-hammer.md b/.changeset/mighty-fishes-hammer.md new file mode 100644 index 00000000..2c8b0461 --- /dev/null +++ b/.changeset/mighty-fishes-hammer.md @@ -0,0 +1,5 @@ +--- +"wptelegram": patch +--- + +Fixed PHP errors in Post to Telegram for partial REST API input From 9ea2c79211f7a05dc03dccd76b60716ca2c676a4 Mon Sep 17 00:00:00 2001 From: Irshad Ahmad Date: Wed, 21 Feb 2024 22:06:40 +0530 Subject: [PATCH 3/3] Merge form data with existing --- plugins/wptelegram/src/modules/p2tg/PostSender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/wptelegram/src/modules/p2tg/PostSender.php b/plugins/wptelegram/src/modules/p2tg/PostSender.php index 4f35378e..dedbb65e 100644 --- a/plugins/wptelegram/src/modules/p2tg/PostSender.php +++ b/plugins/wptelegram/src/modules/p2tg/PostSender.php @@ -155,7 +155,7 @@ public function set_form_data() { $form_data['send2tg'] = ! empty( $form_data['send2tg'] ) ? 'yes' : 'no'; - $this->form_data = $form_data; + $this->form_data = array_merge( $this->form_data, $form_data ); // For logging. $this->form_data['is_from_gb'] = true; }