Skip to content
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

php precommit fixes for the 6.4 branch #5653

Draft
wants to merge 2 commits into
base: 6.4
Choose a base branch
from
Draft

php precommit fixes for the 6.4 branch #5653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8fbd7
Various whitespace fixes for 6.4
peterwilsoncc Nov 9, 2023
906e925
EOL style fixes for 6.4
peterwilsoncc Nov 9, 2023
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
2 changes: 1 addition & 1 deletion src/wp-includes/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@ function get_comments_pagination_arrow( $block, $pagination_type = 'next' ) {
* @return string Filtered content without any HTML on the footnote content and with the sanitized id.
*/
function _wp_filter_post_meta_footnotes( $footnotes ) {
$footnotes_decoded = json_decode( $footnotes, true );
$footnotes_decoded = json_decode( $footnotes, true );
if ( ! is_array( $footnotes_decoded ) ) {
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-block-list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function offsetGet( $offset ) {
$block = $this->blocks[ $offset ];

if ( isset( $block ) && is_array( $block ) ) {
$block = new WP_Block( $block, $this->available_context, $this->registry );
$block = new WP_Block( $block, $this->available_context, $this->registry );
$this->blocks[ $offset ] = $block;
}

Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2608,7 +2608,7 @@ function gallery_shortcode( $attr ) {
}
} elseif ( ! empty( $atts['exclude'] ) ) {
$post_parent_id = $id;
$attachments = get_children(
$attachments = get_children(
array(
'post_parent' => $id,
'exclude' => $atts['exclude'],
Expand All @@ -2621,7 +2621,7 @@ function gallery_shortcode( $attr ) {
);
} else {
$post_parent_id = $id;
$attachments = get_children(
$attachments = get_children(
array(
'post_parent' => $id,
'post_status' => 'inherit',
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ function update_option( $option, $value, $autoload = null ) {
// Delete the individual cache, then set in alloptions cache.
wp_cache_delete( $option, 'options' );

$alloptions = wp_load_alloptions( true );
$alloptions = wp_load_alloptions( true );
$alloptions[ $option ] = $serialized_value;
wp_cache_set( 'alloptions', $alloptions, 'options' );
} else {
Expand Down
Loading
Loading