WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code Modernization: Rename reserved keyword used as variable. 

Change the `$echo` parameter added to `wp_update_php_annnotation()` to `$display` to avoid using reserved PHP keywords as parameters. Follow up to [56570].

Props kebbet, mukesh27.
See #57791.
Built from https://develop.svn.wordpress.org/trunk@56662


git-svn-id: http://core.svn.wordpress.org/trunk@56174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
joedolson 2023-09-22 18:14:16 +00:00
parent da9f594a55
commit 4b17383d2c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/functions.php
View File

@ -8318,19 +8318,19 @@ function wp_get_default_update_php_url() {
* *
* @since 5.1.0 * @since 5.1.0
* @since 5.2.0 Added the `$before` and `$after` parameters. * @since 5.2.0 Added the `$before` and `$after` parameters.
* @since 6.4.0 Added the `$echo` parameter. * @since 6.4.0 Added the `$display` parameter.
* *
* @param string $before Markup to output before the annotation. Default `<p class="description">`. * @param string $before Markup to output before the annotation. Default `<p class="description">`.
* @param string $after Markup to output after the annotation. Default `</p>`. * @param string $after Markup to output after the annotation. Default `</p>`.
* @param bool $echo Markup should echo if true. Default `true`. * @param bool $display Whether to echo or return the markup. Default `true` for echo.
* *
* @return string|void * @return string|void
*/ */
function wp_update_php_annotation( $before = '<p class="description">', $after = '</p>', $echo = true ) { function wp_update_php_annotation( $before = '<p class="description">', $after = '</p>', $display = true ) {
$annotation = wp_get_update_php_annotation(); $annotation = wp_get_update_php_annotation();
if ( $annotation ) { if ( $annotation ) {
if ( $echo ) { if ( $display ) {
echo $before . $annotation . $after; echo $before . $annotation . $after;
} else { } else {
return $before . $annotation . $after; return $before . $annotation . $after;

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4-alpha-56661'; $wp_version = '6.4-alpha-56662';
/** /**
* 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.