updated plugin `Simple Local Avatars` version 2.7.7

wp-content/plugins/simple-local-avatars/dist/simple-local-avatars.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'aa61da036e6891c324d0');
+<?php return array('dependencies' => array(), 'version' => 'b0f8e17e234bd3f014d0');

wp-content/plugins/simple-local-avatars/includes/class-simple-local-avatars.php

@@ -65,9 +65,9 @@ class Simple_Local_Avatars {
 	public function __construct() {
 		$this->add_hooks();
 
-		$this->options    = (array) get_option( 'simple_local_avatars' );
+		$this->options        = (array) get_option( 'simple_local_avatars' );
-		$this->user_key   = 'simple_local_avatar';
+		$this->user_key       = 'simple_local_avatar';
-		$this->rating_key = 'simple_local_avatar_rating';
+		$this->rating_key     = 'simple_local_avatar_rating';
 
 		if (
 			! $this->is_avatar_shared() // Are we sharing avatars?
@@ -136,26 +136,18 @@ class Simple_Local_Avatars {
 		}
 
 		if ( 'profile.php' === $pagenow ) {
-			add_filter(
+			add_filter( 'media_view_strings', function ( $strings ) {
-				'media_view_strings',
+				$strings['skipCropping'] = esc_html__( 'Default Crop', 'simple-local-avatars' );
-				function ( $strings ) {
-					$strings['skipCropping'] = esc_html__( 'Default Crop', 'simple-local-avatars' );
 
-					return $strings;
+				return $strings;
-				},
+			}, 10, 1 );
-				10,
-				1
-			);
 		}
 
 		// Fix: An error occurred cropping the image (https://github.com/10up/simple-local-avatars/issues/141).
 		if ( isset( $_POST['action'] ) && 'crop-image' === $_POST['action'] && is_admin() && wp_doing_ajax() ) {
-			add_action(
+			add_action( 'plugins_loaded', function () {
-				'plugins_loaded',
+				remove_all_actions( 'setup_theme' );
-				function () {
+			} );
-					remove_all_actions( 'setup_theme' );
-				}
-			);
 		}
 	}
 
@@ -338,21 +330,14 @@ class Simple_Local_Avatars {
 	 */
 	public function get_simple_local_avatar_url( $id_or_email, $size ) {
 		$user_id = $this->get_user_id( $id_or_email );
-		$size    = (int) $size;
 
 		if ( empty( $user_id ) ) {
 			return '';
 		}
 
-		$local_avatars = get_user_meta( $user_id, $this->user_key, true );
-
-		// Return avatar if exists.
-		if ( is_array( $local_avatars ) && array_key_exists( $size, $local_avatars ) && ( strpos( $local_avatars[ $size ], content_url() ) === 0 ) ) {
-			return esc_url( $local_avatars[ $size ] );
-		}
-
 		// Fetch local avatar from meta and make sure it's properly set.
-		if ( empty( $local_avatars['media_id'] ) ) {
+		$local_avatars = get_user_meta( $user_id, $this->user_key, true );
+		if ( empty( $local_avatars['full'] ) ) {
 			return '';
 		}
 
@@ -390,66 +375,69 @@ class Simple_Local_Avatars {
 		}
 
 		// handle "real" media
-		// If using shared avatars, make sure we validate the URL on the main site.
+		if ( ! empty( $local_avatars['media_id'] ) ) {
-		if ( $this->is_avatar_shared() ) {
+			// If using shared avatars, make sure we validate the URL on the main site.
-			$origin_blog_id = ! empty( $local_avatars['blog_id'] ) ? $local_avatars['blog_id'] : get_main_site_id();
+			if ( $this->is_avatar_shared() ) {
-			switch_to_blog( $origin_blog_id );
+				$origin_blog_id = isset( $local_avatars['blog_id'] ) && ! empty( $local_avatars['blog_id'] ) ? $local_avatars['blog_id'] : get_main_site_id();
+				switch_to_blog( $origin_blog_id );
+			}
+
+			$avatar_full_path = get_attached_file( $local_avatars['media_id'] );
+
+			if ( $this->is_avatar_shared() ) {
+				restore_current_blog();
+			}
+
+			// has the media been deleted?
+			if ( ! $avatar_full_path ) {
+				return '';
+			}
 		}
 
-		$avatar_full_path = get_attached_file( $local_avatars['media_id'] );
+		$size = (int) $size;
-
-		if ( $this->is_avatar_shared() ) {
-			restore_current_blog();
-		}
-
-		// has the media been deleted?
-		if ( ! $avatar_full_path ) {
-			return '';
-		}
-
-		// Use dynamic full url in favour of host/domain change.
-		$local_avatars['full'] = wp_get_attachment_image_url( $local_avatars['media_id'], 'full' );
 
 		// Generate a new size.
-		// Just in case of failure elsewhere, set the full size as default.
+		if ( ! array_key_exists( $size, $local_avatars ) ) {
-		$local_avatars[ $size ] = $local_avatars['full'];
+			$local_avatars[ $size ] = $local_avatars['full']; // just in case of failure elsewhere
 
-		// allow automatic rescaling to be turned off
+			// allow automatic rescaling to be turned off
-		if ( apply_filters( 'simple_local_avatars_dynamic_resize', true ) ) :
+			if ( apply_filters( 'simple_local_avatars_dynamic_resize', true ) ) :
 
-			$upload_path = wp_upload_dir();
+				$upload_path = wp_upload_dir();
 
-			// get path for image by converting URL, unless its already been set, thanks to using media library approach
+				// get path for image by converting URL, unless its already been set, thanks to using media library approach
-			if ( ! isset( $avatar_full_path ) ) {
+				if ( ! isset( $avatar_full_path ) ) {
-				$avatar_full_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $local_avatars['full'] );
+					$avatar_full_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $local_avatars['full'] );
-			}
+				}
 
-			// generate the new size
+				// generate the new size
-			$editor = wp_get_image_editor( $avatar_full_path );
+				$editor = wp_get_image_editor( $avatar_full_path );
-			if ( ! is_wp_error( $editor ) ) {
+				if ( ! is_wp_error( $editor ) ) {
-				$resized = $editor->resize( $size, $size, true );
+					$resized = $editor->resize( $size, $size, true );
-				if ( ! is_wp_error( $resized ) ) {
+					if ( ! is_wp_error( $resized ) ) {
-					$dest_file = $editor->generate_filename();
+						$dest_file = $editor->generate_filename();
-					$saved     = $editor->save( $dest_file );
+						$saved     = $editor->save( $dest_file );
-					if ( ! is_wp_error( $saved ) ) {
+						if ( ! is_wp_error( $saved ) ) {
-						// Transform the destination file path into URL.
+							// Transform the destination file path into URL.
-						$dest_file_url = '';
+							$dest_file_url = '';
-						if ( false !== strpos( $dest_file, $upload_path['basedir'] ) ) {
+							if ( false !== strpos( $dest_file, $upload_path['basedir'] ) ) {
-							$dest_file_url = str_replace( $upload_path['basedir'], $upload_path['baseurl'], $dest_file );
+								$dest_file_url = str_replace( $upload_path['basedir'], $upload_path['baseurl'], $dest_file );
-						} elseif ( is_multisite() && false !== strpos( $dest_file, ABSPATH . 'wp-content/uploads' ) ) {
+							} else if ( is_multisite() && false !== strpos( $dest_file, ABSPATH . 'wp-content/uploads' ) ) {
-							$dest_file_url = str_replace( ABSPATH . 'wp-content/uploads', network_site_url( '/wp-content/uploads' ), $dest_file );
+								$dest_file_url = str_replace( ABSPATH . 'wp-content/uploads', network_site_url( '/wp-content/uploads' ), $dest_file );
+							}
+
+							$local_avatars[ $size ] = $dest_file_url;
 						}
-
-						$local_avatars[ $size ] = $dest_file_url;
 					}
 				}
-			}
 
-			// save updated avatar sizes
+				// save updated avatar sizes
-			update_user_meta( $user_id, $this->user_key, $local_avatars );
+				update_user_meta( $user_id, $this->user_key, $local_avatars );
-		endif;
 
-		if ( strpos( $local_avatars[ $size ], 'http' ) !== 0 ) {
+			endif;
+		}
+
+		if ( 'http' !== substr( $local_avatars[ $size ], 0, 4 ) ) {
 			$local_avatars[ $size ] = home_url( $local_avatars[ $size ] );
 		}
 
@@ -1037,7 +1025,7 @@ class Simple_Local_Avatars {
 		 *
 		 * @param int $user_id Id of the user who's avatar was updated
 		 */
-		do_action( 'simple_local_avatar_updated', $user_id );
+		do_action( 'simple_local_avatar_updated' , $user_id );
 	}
 
 	/**
@@ -1444,9 +1432,9 @@ class Simple_Local_Avatars {
 				$file_name_data = pathinfo( get_attached_file( $media_id ) );
 			}
 
-			$file_dir_name = $file_name_data['dirname'];
+			$file_dir_name  = $file_name_data['dirname'];
-			$file_name     = $file_name_data['filename'];
+			$file_name      = $file_name_data['filename'];
-			$file_ext      = $file_name_data['extension'];
+			$file_ext       = $file_name_data['extension'];
 			foreach ( $local_avatars as $local_avatars_key => $local_avatar_value ) {
 				if ( ! in_array( $local_avatars_key, [ 'media_id', 'full' ], true ) ) {
 					$file_size_path = sprintf( '%1$s/%2$s-%3$sx%3$s.%4$s', $file_dir_name, $file_name, $local_avatars_key, $file_ext );

wp-content/plugins/simple-local-avatars/readme.txt

@@ -5,7 +5,7 @@ Tags:              avatar, gravatar, user photos, users, profile
 Requires at least: 5.7
 Tested up to:      6.4
 Requires PHP:      7.4
-Stable tag:        2.7.6
+Stable tag:        2.7.7
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -47,6 +47,10 @@ No.  Simple Local Avatars neither collects, stores, nor sends any PII data of vi
 
 == Changelog ==
 
+= 2.7.7 - 2023-12-13 =
+* **Fixed:** Revert the Host/Domain support for local avatar URL (props [@faisal-alvi](https://github.com/faisal-alvi), [@jakejackson1](https://github.com/jakejackson1), [@leogermani](https://github.com/leogermani), [@dkotter](https://github.com/dkotter) via [#247](https://github.com/10up/simple-local-avatars/pull/247)).
+* **Security:** Bump `axios` from 0.25.0 to 1.6.2 and `@wordpress/scripts` from 23.7.2 to 26.18.0 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi) via [#250](https://github.com/10up/simple-local-avatars/pull/250)).
+
 = 2.7.6 - 2023-11-30 =
 * **Added:** Check for minimum required PHP version before loading the plugin (props [@kmgalanakis](https://github.com/kmgalanakis), [@faisal-alvi](https://github.com/faisal-alvi) via [#226](https://github.com/10up/simple-local-avatars/pull/226)).
 * **Added:** `pre_simple_local_avatar_url` filter to allow an avatar image to be short-circuited before Simple Local Avatars processes it (props [@johnbillion](https://github.com/johnbillion), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#237](https://github.com/10up/simple-local-avatars/pull/237)).

wp-content/plugins/simple-local-avatars/simple-local-avatars.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Simple Local Avatars
  * Plugin URI:        https://10up.com/plugins/simple-local-avatars-wordpress/
  * Description:       Adds an avatar upload field to user profiles. Generates requested sizes on demand, just like Gravatar! Simple and lightweight.
- * Version:           2.7.6
+ * Version:           2.7.7
  * Requires at least: 5.7
  * Requires PHP:      7.4
  * Author:            10up
@@ -22,7 +22,7 @@
  *
  * @return string Minimum version required.
  */
-function minimum_php_requirement(): string {
+function minimum_php_requirement() {
 	return '7.4';
 }
 
@@ -33,7 +33,7 @@ function minimum_php_requirement(): string {
  *
  * @return bool True if meets minimum requirements, false otherwise.
  */
-function site_meets_php_requirements(): bool {
+function site_meets_php_requirements() {
 	return version_compare( phpversion(), minimum_php_requirement(), '>=' );
 }
 
@@ -67,7 +67,7 @@ define( 'SLA_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 require_once dirname( __FILE__ ) . '/includes/class-simple-local-avatars.php';
 
 // Global constants.
-define( 'SLA_VERSION', '2.7.6' );
+define( 'SLA_VERSION', '2.7.7' );
 define( 'SLA_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 
 if ( ! defined( 'SLA_IS_NETWORK' ) ) {