From 82a5d41d9b15df547eec584e4c026a0ac5a38871 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 19 Jun 2020 21:14:08 +0000
Subject: [PATCH] Help/About: Move "Learn more: Auto-updates documentation"
 link about "Support", for consistency with other screens.

Follow-up to [48062].

See #50215.
Built from https://develop.svn.wordpress.org/trunk@48095


git-svn-id: http://core.svn.wordpress.org/trunk@47864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/themes.php | 5 +++--
 wp-admin/plugins.php        | 5 +++--
 wp-admin/themes.php         | 7 ++++---
 wp-admin/update-core.php    | 5 +++--
 wp-includes/version.php     | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 2236f1ca92..730ab906b1 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -303,6 +303,7 @@ get_current_screen()->add_help_tab(
 );
 
 $help_sidebar_autoupdates = '';
+
 if ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type( 'theme' ) ) {
 	get_current_screen()->add_help_tab(
 		array(
@@ -320,8 +321,8 @@ if ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type(
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen">Documentation on Network Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>' .
-	$help_sidebar_autoupdates
+	$help_sidebar_autoupdates .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index a2a771c4c3..42f196f15a 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -566,6 +566,7 @@ get_current_screen()->add_help_tab(
 );
 
 $help_sidebar_autoupdates = '';
+
 if ( current_user_can( 'update_plugins' ) && wp_is_auto_update_enabled_for_type( 'plugin' ) ) {
 	get_current_screen()->add_help_tab(
 		array(
@@ -583,8 +584,8 @@ if ( current_user_can( 'update_plugins' ) && wp_is_auto_update_enabled_for_type(
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/managing-plugins/">Documentation on Managing Plugins</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>' .
-	$help_sidebar_autoupdates
+	$help_sidebar_autoupdates .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index fa442bb5e2..2a41dbd054 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -182,8 +182,9 @@ if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' )
 	);
 } // End if 'edit_theme_options' && 'customize'.
 
-// Help tab: Auto-updates.
 $help_sidebar_autoupdates = '';
+
+// Help tab: Auto-updates.
 if ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type( 'theme' ) ) {
 	$help_tab_autoupdates =
 		'<p>' . __( 'Auto-updates can be enabled or disabled for each individual theme. Themes with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.' ) . '</p>' .
@@ -203,8 +204,8 @@ if ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type(
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/using-themes/">Documentation on Using Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>' .
-	$help_sidebar_autoupdates
+	$help_sidebar_autoupdates .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 if ( current_user_can( 'switch_themes' ) ) {
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 40c72ebe59..1af08bb9b2 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -746,6 +746,7 @@ get_current_screen()->add_help_tab(
 );
 
 $help_sidebar_autoupdates = '';
+
 if ( ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type( 'theme' ) ) || ( current_user_can( 'update_plugins' ) && wp_is_auto_update_enabled_for_type( 'plugin' ) ) ) {
 	$help_tab_autoupdates  = '<p>' . __( 'Auto-updates can be enabled or disabled for each individual theme or plugin. Themes or plugins with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.' ) . '</p>';
 	$help_tab_autoupdates .= '<p>' . __( 'Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.' ) . '</p>';
@@ -764,8 +765,8 @@ if ( ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>' .
-	$help_sidebar_autoupdates
+	$help_sidebar_autoupdates .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 if ( 'upgrade-core' === $action ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1fab618e6b..e313251066 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48094';
+$wp_version = '5.5-alpha-48095';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.