Merge branch 'develop' for v3.6.2

Author: mrrobot47

src/helper/class-ee-site.php

@@ -1733,7 +1733,7 @@ public function ssl_verify( $args = [], $assoc_args = [], $www_or_non_www = fals
 	 * [--format=<format>]
 	 * : Render output in a particular format.
 	 * ---
-	 * default: table
+	 * default: json
 	 * options:
 	 *   - table
 	 *   - csv
@@ -1779,7 +1779,13 @@ public function ssl_info( $args, $assoc_args ) {
 						$challenge = $client->loadDomainAuthorizationChallenge( $domain );
 						if ( method_exists( $challenge, 'toArray' ) ) {
 							$data        = $challenge->toArray();
-							$record_name = isset( $data['dnsRecordName'] ) ? $data['dnsRecordName'] : '_acme-challenge.' . $domain;
+							// Always use _acme-challenge.base-domain for wildcard domains
+							if ( 0 === strpos( $domain, '*.' ) ) {
+								$base_domain = substr( $domain, 2 );
+								$record_name = '_acme-challenge.' . $base_domain;
+							} else {
+								$record_name = isset( $data['dnsRecordName'] ) ? $data['dnsRecordName'] : '_acme-challenge.' . $domain;
+							}
 							if ( isset( $data['dnsRecordValue'] ) ) {
 								$record_value = $data['dnsRecordValue'];
 							} elseif ( isset( $data['payload'] ) ) {