WP Update notice shown twice

[Presskopp]

On updates (wp-admin/update-core.php) the message to update manually to a new localised version is shown twice.

Expected behaviour would be to show the message only once and then also show a message about the possibility to update to the US version manually.

Original phrase:
"You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> manually:"

[audrasjb]

Good point.

I suspect this is because the list_core_update() function is called two times, inside a foreach loop.

​https://build.trac.wordpress.org/browser/trunk/wp-admin/update-core.php?marks=140#L222

[benjamingosset]

Hi,

After taking a look to the list_core_update() function pointed by @audrasjb , it seems that the if statement on line 43 fails when $update->locale is 'en_US' and get_locale() is different than 'en_US'. By the way, update button has the correct locale, only the message is wrong.

I add an elseif statement (which works too with a else statement) to set $version_string working for a non-en_US locale when displaying 'en_US' update.

Could someone check if everything is ok ?

Thanks

[benjamingosset]

Before patch

[benjamingosset]

After patch

[audrasjb]

I tested the patch and it fixes the issue. Thanks @benjamingosset I'm marking this as ready for commit.

[audrasjb]

In 52197:

Upgrade/Install: Differentiate en_US version strings from localized ones.

Adds a condition to $version_string to determine whether the Core update is the original en_US package, or a localized one.

This change fixes an issue where these packages were not differentiated and duplicate messages were displayed.

Props Presskopp, benjamingosset.
Fixes #53710.

[audrasjb]

Committed to WP 5.9. Thanks @benjamingosset for the patch!

[benjamingosset]

Replying to audrasjb:

Committed to WP 5.9. Thanks @benjamingosset for the patch!

Nice ! Thanks for the commit @audrasjb !