Changeset 62308

Timestamp:

05/06/2026 07:54:48 PM (5 weeks ago)

Author:

desrosj

Message:

Connectors: Partial backport of [62210].

This merges the modifications from [62210] that were not directly reverting the changes in [62193] to the 7.0 branch.

While [62193] never made its way into the 7.0 branch, these changes are needed to ensure backports touching these lines are able to complete without merge conflicts.

Reviewed by desrosj.
Partially merges [62210] to the 7.0 branch.

Props peterwilsoncc, jorgefilipecosta, johnbillion, eclev91, desrosj, davidbaumwald, jorbin.
See #65012.

Location:

branches/7.0

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-connector-registry.php (modified) (2 diffs)
• src/wp-includes/connectors.php (modified) (3 diffs)

branches/7.0/src/wp-includes/class-wp-connector-registry.php

@@ -72 +72 @@
      * explicitly. If omitted, one is automatically generated using the pattern
      * `connectors_{$type}_{$id}_api_key`, with hyphens in the type and ID normalized
-     * to underscores (e.g., connector type `spam_filtering` with ID `akismet` produces
-     * `connectors_spam_filtering_akismet_api_key`). This setting name is used for the
+     * to underscores (e.g., connector type `spam_filtering` with ID `my_plugin` produces
+     * `connectors_spam_filtering_my_plugin_api_key`). This setting name is used for the
      * Settings API registration and REST API exposure.
      *
@@ -111 +111 @@
      *
      *         @type string $file The plugin's main file path relative to the plugins
-     *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+     *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
      *     }
      * }

branches/7.0/src/wp-includes/connectors.php

@@ -60 +60 @@
  *
  *         @type string $file The plugin's main file path relative to the plugins
- *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *     }
  * }
@@ -121 +121 @@
  *
  *             @type string $file The plugin's main file path relative to the plugins
- *                                directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                                directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *         }
  *     }
@@ -399 +399 @@
  * @access private
  *
- * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_akismet_api_key').
- * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'AKISMET_API_KEY').
- * @param string $constant_name Optional. PHP constant name to check (e.g., 'AKISMET_API_KEY').
+ * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_my_plugin_api_key').
+ * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'MY_PLUGIN_API_KEY').
+ * @param string $constant_name Optional. PHP constant name to check (e.g., 'MY_PLUGIN_API_KEY').
  * @return string The key source: 'env', 'constant', 'database', or 'none'.
  */