From f009b0e966c5eaf16389431b64d506cf049fca81 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Tue, 30 Nov 2021 00:19:28 +0900
Subject: [PATCH] Use checked()

---
 inc/class-destination-s3.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/inc/class-destination-s3.php b/inc/class-destination-s3.php
index 432a34d0..49028845 100755
--- a/inc/class-destination-s3.php
+++ b/inc/class-destination-s3.php
@@ -130,12 +130,11 @@ class="regular-text"
                                         </legend>
                                         <label for="s3base_multipart">
                                             <input name="s3base_multipart" type="checkbox"
-                                                   value="1" <?= !empty(
-                                            BackWPup_Option::get(
-                                                $jobid,
-                                                's3base_multipart'
-                                            )
-                                            ) ? 'checked="checked"' : '' ?>>
+                                                   value="1" <?= checked(
+                                                   BackWPup_Option::get(
+                                                       $jobid,
+                                                       's3base_multipart'
+                                                   ), 1) ?>>
                                             <?php esc_html_e(
                                                 'Destination supports multipart',
                                                 'backwpup'
@@ -159,12 +158,11 @@ class="regular-text"
                                         <label
                                             for="s3base_pathstylebucket">
                                             <input name="s3base_pathstylebucket" type="checkbox"
-                                                   value="1" <?= !empty(
+                                                   value="1" <?= checked(
                                                    BackWPup_Option::get(
                                                        $jobid,
                                                        's3base_pathstylebucket'
-                                                   )
-                                                   ) ? 'checked="checked"' : '' ?>>
+                                                   ), 1) ?>>
                                             <?php esc_html_e(
                                                 'Destination provides only Pathstyle buckets',
                                                 'backwpup'
@@ -1110,10 +1108,10 @@ function awsgetbucket() {
 						s3bucketselected: $( 'input[name="s3bucketselected"]' ).val(),
 						s3base_url      : $( 'input[name="s3base_url"]' ).val(),
 						s3region        : $( '#s3region' ).val(),
-						s3base_region          : $( 'input[name="s3base_region"]' ).val(),
-						s3base_version         : $( 'input[name="s3base_version"]' ).val(),
-						s3base_signature       : $( 'input[name="s3base_signature"]' ).val(),
-						s3base_multipart       : $( 'input[name="s3base_multipart"]' ).is(':checked'),
+						s3base_region      : $( 'input[name="s3base_region"]' ).val(),
+						s3base_version      : $( 'input[name="s3base_version"]' ).val(),
+						s3base_signature      : $( 'input[name="s3base_signature"]' ).val(),
+						s3base_multipart      : $( 'input[name="s3base_multipart"]' ).is(':checked'),
 						s3base_pathstylebucket : $( 'input[name="s3base_pathstylebucket"]' ).is(':checked'),
 						_ajax_nonce     : $( '#backwpupajaxnonce' ).val()
 					};