Changeset 58963 for trunk/src/wp-admin/options.php

Timestamp:

09/02/2024 12:11:39 AM (2 years ago)

Author:

peterwilsoncc

Message:

Options, Meta APIs: Prevent mail options triggering a deprecation warning.

Prevents a deprecation warning saving options when the post by email feature is turned off in code using the enable_post_by_email_configuration filter.

Props ironprogrammer, manbo, narenin, sebastienserre, siliconforks.
Fixes #61144.

File:

• trunk/src/wp-admin/options.php (modified) (3 diffs)

trunk/src/wp-admin/options.php

@@ -159 +159 @@
 $allowed_options['privacy'] = array();
 
-$mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
+/**
+ * Filters whether the post-by-email functionality is enabled.
+ *
+ * @since 3.0.0
+ *
+ * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
+ */
+if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+        $allowed_options['writing'][] = 'mailserver_url';
+        $allowed_options['writing'][] = 'mailserver_port';
+        $allowed_options['writing'][] = 'mailserver_login';
+        $allowed_options['writing'][] = 'mailserver_pass';
+}
 
 if ( ! is_utf8_charset() ) {
@@ -181 +193 @@
         $allowed_options['general'][] = 'default_role';
 
-        $allowed_options['writing']   = array_merge( $allowed_options['writing'], $mail_options );
         if ( '1' === get_option( 'blog_public' ) ) {
                 $allowed_options['writing'][] = 'ping_sites';
@@ -198 +209 @@
                 $allowed_options['media'][] = 'upload_path';
                 $allowed_options['media'][] = 'upload_url_path';
-        }
-} else {
-        /**
-         * Filters whether the post-by-email functionality is enabled.
-         *
-         * @since 3.0.0
-         *
-         * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
-         */
-        if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-                $allowed_options['writing'] = array_merge( $allowed_options['writing'], $mail_options );
         }
 }