Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-10-29 23:09:44 +01:00
Code Issues Projects Releases Wiki Activity

Pings/Trackbacks: Validate that the specified charset is available on the receiving site.

Browse Source 
This aims to avoid a subsequent fatal error from `mb_convert_encoding()` when an invalid charset is specified.

Follow-up to [1734], [2563], [12032].

Props dd32, jrf, oglekler, rajinsharwar.
Fixes #60261.
Built from https://develop.svn.wordpress.org/trunk@59255


git-svn-id: http://core.svn.wordpress.org/trunk@58647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-10-18 15:56:18 +00:00
parent 4725c28e34
commit 51868a5e8c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.7-beta3-59254'; $wp_version = '6.7-beta3-59255';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

9
wp-trackback.php
View File

@ -60,7 +60,14 @@ $blog_name = isset( $_POST['blog_name'] ) ? wp_unslash( $_POST['blog_name'] ) :
if ( $charset ) { if ( $charset ) {
$charset = str_replace( array( ',', ' ' ), '', strtoupper( trim( $charset ) ) ); $charset = str_replace( array( ',', ' ' ), '', strtoupper( trim( $charset ) ) );
} else {
// Validate the specified "sender" charset is available on the receiving site.
if ( function_exists( 'mb_list_encodings' ) && ! in_array( $charset, mb_list_encodings(), true ) ) {
$charset = '';
}
}
if ( ! $charset ) {
$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS'; $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
} }