Skip to content

Coding Standards: Rename variables for WP 7.0 #10780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huzaifaalmesbah wants to merge 8 commits into
base: trunk
Choose a base branch
from
Open

Coding Standards: Rename variables for WP 7.0 #10780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d79ae3
Coding Standards: Rename variables for WP 7.0 compliance.
huzaifaalmesbah Jan 23, 2026
0aa5ecc
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Jan 23, 2026
a9a1ad4
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Jan 26, 2026
6aee6f3
Align assignment operators
huzaifaalmesbah Jan 26, 2026
1685162
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Jan 27, 2026
00a7440
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Jan 29, 2026
9f42810
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Feb 5, 2026
d9668d6
Merge branch 'trunk' into fix/64226-variable-naming-compliance
huzaifaalmesbah Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/wp-admin/includes/image-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,26 +985,26 @@ function wp_save_image( $post_id ) {
// Generate new filename.
$path = get_attached_file( $post_id );

$basename = pathinfo( $path, PATHINFO_BASENAME );
$dirname = pathinfo( $path, PATHINFO_DIRNAME );
$ext = pathinfo( $path, PATHINFO_EXTENSION );
$filename = pathinfo( $path, PATHINFO_FILENAME );
$suffix = time() . rand( 100, 999 );
$basename = pathinfo( $path, PATHINFO_BASENAME );
$dirname = pathinfo( $path, PATHINFO_DIRNAME );
$extension = pathinfo( $path, PATHINFO_EXTENSION );
$filename = pathinfo( $path, PATHINFO_FILENAME );
$suffix = time() . rand( 100, 999 );

if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE
&& isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] !== $basename
) {

if ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
$new_path = "{$dirname}/{$filename}-temp.{$ext}";
$new_path = "{$dirname}/{$filename}-temp.{$extension}";
} else {
$new_path = $path;
}
} else {
while ( true ) {
$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
$filename .= "-e{$suffix}";
$new_filename = "{$filename}.{$ext}";
$new_filename = "{$filename}.{$extension}";
$new_path = "{$dirname}/$new_filename";

if ( file_exists( $new_path ) ) {
Expand Down
28 changes: 14 additions & 14 deletions src/wp-admin/includes/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,16 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
return new WP_Error( 'upload_error', $file['error'] );
}

$name = $_FILES[ $file_id ]['name'];
$ext = pathinfo( $name, PATHINFO_EXTENSION );
$name = wp_basename( $name, ".$ext" );
$name = $_FILES[ $file_id ]['name'];
$extension = pathinfo( $name, PATHINFO_EXTENSION );
$name = wp_basename( $name, ".$extension" );

$url = $file['url'];
$type = $file['type'];
$file = $file['file'];
$title = sanitize_text_field( $name );
$content = '';
$excerpt = '';
$url = $file['url'];
$type = $file['type'];
$file = $file['file'];
$title = sanitize_text_field( $name );
$content = '';
$excerpt = '';

if ( preg_match( '#^audio#', $type ) ) {
$meta = wp_read_audio_metadata( $file );
Expand Down Expand Up @@ -904,12 +904,12 @@ function wp_media_upload_handler() {
}

$type = 'file';
$ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
$extension = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );

if ( $ext ) {
$ext_type = wp_ext2type( $ext );
if ( 'audio' === $ext_type || 'video' === $ext_type ) {
$type = $ext_type;
if ( $extension ) {
$extension_type = wp_ext2type( $extension );
if ( 'audio' === $extension_type || 'video' === $extension_type ) {
$type = $extension_type;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/wp-admin/includes/post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,17 +350,17 @@ function edit_post( $post_data = null ) {
}

if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
$id3data = wp_get_attachment_metadata( $post_id );
if ( ! is_array( $id3data ) ) {
$id3data = array();
$id3_data = wp_get_attachment_metadata( $post_id );
if ( ! is_array( $id3_data ) ) {
$id3_data = array();
}

foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) {
if ( isset( $post_data[ 'id3_' . $key ] ) ) {
$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
$id3_data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
}
}
wp_update_attachment_metadata( $post_id, $id3data );
wp_update_attachment_metadata( $post_id, $id3_data );
}

// Meta stuff.
Expand Down
Loading