From 5f304905270f202e009e0d1fb805710f18921aae Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 1 Dec 2022 15:43:20 +0000
Subject: [PATCH] Coding Standards: Remove a one-time `$loading` variable in
 `get_avatar()`.

This aims to bring consistency between two similar code fragments.

Follow-up to [47554], [53480], [54895].

See #56791.
Built from https://develop.svn.wordpress.org/trunk@54920


git-svn-id: http://core.svn.wordpress.org/trunk@54472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 14 +++++++++-----
 wp-includes/version.php   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 7ed917001b..cf041fe7da 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -2867,22 +2867,26 @@ if ( ! function_exists( 'get_avatar' ) ) :
 			}
 		}
 
-		// Add `loading` attribute.
+		// Add `loading` and `decoding` attributes.
 		$extra_attr = $args['extra_attr'];
-		$loading    = $args['loading'];
 
-		if ( in_array( $loading, array( 'lazy', 'eager' ), true ) && ! preg_match( '/\bloading\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['loading'], array( 'lazy', 'eager' ), true )
+			&& ! preg_match( '/\bloading\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
 
-			$extra_attr .= "loading='{$loading}'";
+			$extra_attr .= "loading='{$args['loading']}'";
 		}
 
-		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ), true ) && ! preg_match( '/\bdecoding\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ), true )
+			&& ! preg_match( '/\bdecoding\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
+
 			$extra_attr .= "decoding='{$args['decoding']}'";
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index da5c6f3a0d..851c7a45f0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-54919';
+$wp_version = '6.2-alpha-54920';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.