From 35a2322d321a564f2ded918a72ca30be378e3cc8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov
Date: Sat, 25 May 2019 14:24:50 +0000
Subject: [PATCH] General: Update support forum links.
There are a lot of places in Core that link to https://wordpress.org/support/ for the support forums, but that's now the URL for HelpHub. The new forums link is https://wordpress.org/support/forums/.
This is a follow-up to [45140], which changed the links in help tabs.
Props dilipbheda.
Fixes #47239. See #46790.
Built from https://develop.svn.wordpress.org/trunk@45412
git-svn-id: http://core.svn.wordpress.org/trunk@45223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/includes/class-wp-automatic-updater.php | 2 +-
wp-admin/includes/plugin-install.php | 6 +++---
wp-admin/includes/theme.php | 6 +++---
wp-admin/includes/translation-install.php | 6 +++---
wp-admin/includes/update.php | 2 +-
wp-admin/theme-install.php | 2 +-
wp-includes/customize/class-wp-customize-themes-section.php | 2 +-
wp-includes/update.php | 6 +++---
wp-includes/version.php | 2 +-
wp-login.php | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php
index 72a93667af..23b2258a90 100644
--- a/wp-admin/includes/class-wp-automatic-updater.php
+++ b/wp-admin/includes/class-wp-automatic-updater.php
@@ -738,7 +738,7 @@ class WP_Automatic_Updater {
} else {
// Add a note about the support forums.
$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
- $body .= "\n" . __( 'https://wordpress.org/support/' );
+ $body .= "\n" . __( 'https://wordpress.org/support/forums/' );
}
// Updates are important!
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index b5f770d65a..b01dfdd126 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -175,7 +175,7 @@ function plugins_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
@@ -188,7 +188,7 @@ function plugins_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
$request->get_error_message()
);
@@ -203,7 +203,7 @@ function plugins_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
wp_remote_retrieve_body( $request )
);
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index f1d0d374bd..5be1b9f6dc 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -505,7 +505,7 @@ function themes_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
@@ -519,7 +519,7 @@ function themes_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
$request->get_error_message()
);
@@ -534,7 +534,7 @@ function themes_api( $action, $args = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
wp_remote_retrieve_body( $request )
);
diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php
index 73d27fb1b2..6e8f4b698e 100644
--- a/wp-admin/includes/translation-install.php
+++ b/wp-admin/includes/translation-install.php
@@ -60,7 +60,7 @@ function translations_api( $type, $args = null ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
@@ -74,7 +74,7 @@ function translations_api( $type, $args = null ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
$request->get_error_message()
);
@@ -86,7 +86,7 @@ function translations_api( $type, $args = null ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
wp_remote_retrieve_body( $request )
);
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 1a4bee003a..d4c1dd6a07 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -132,7 +132,7 @@ function get_core_checksums( $version, $locale ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 8184297991..422b73c7a1 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -60,7 +60,7 @@ wp_localize_script(
'error' => sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
),
'tryAgain' => __( 'Try Again' ),
'themesFound' => __( 'Number of Themes found: %d' ),
diff --git a/wp-includes/customize/class-wp-customize-themes-section.php b/wp-includes/customize/class-wp-customize-themes-section.php
index 434feb3f30..177a401103 100644
--- a/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/wp-includes/customize/class-wp-customize-themes-section.php
@@ -87,7 +87,7 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
printf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
);
?>
diff --git a/wp-includes/update.php b/wp-includes/update.php
index 824575099b..83f15f9201 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -155,7 +155,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
@@ -379,7 +379,7 @@ function wp_update_plugins( $extra_stats = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
@@ -564,7 +564,7 @@ function wp_update_themes( $extra_stats = array() ) {
sprintf(
/* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 36da9571c3..d504018884 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
-$wp_version = '5.3-alpha-45411';
+$wp_version = '5.3-alpha-45412';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-login.php b/wp-login.php
index 76f0585e2c..dabab938d4 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -950,7 +950,7 @@ switch ( $action ) {
/* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
__( 'ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ),
__( 'https://wordpress.org/support/article/cookies/' ),
- __( 'https://wordpress.org/support/' )
+ __( 'https://wordpress.org/support/forums/' )
)
);
} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {