-
+ ?>
+
+ avatar_delete( $user_id ); // delete old images if successful
+ $this->avatar_delete( $user_id ); // delete old images if successful.
$meta_value = array();
// set the new avatar
- if ( is_int( $url_or_media_id ) ) {
+ if ( is_int( $url_or_media_id + 0 ) ) {
$meta_value['media_id'] = $url_or_media_id;
$url_or_media_id = wp_get_attachment_url( $url_or_media_id );
}
- $meta_value['full'] = $url_or_media_id;
+ $meta_value['full'] = $url_or_media_id;
+ $meta_value['blog_id'] = get_current_blog_id();
- update_user_meta( $user_id, 'simple_local_avatar', $meta_value ); // save user information (overwriting old)
+ update_user_meta( $user_id, $this->user_key, $meta_value ); // save user information (overwriting old).
}
/**
@@ -466,6 +880,7 @@ class Simple_Local_Avatars {
if ( false !== strpos( $_FILES['simple-local-avatar']['name'], '.php' ) ) {
$this->avatar_upload_error = __( 'For security reasons, the extension ".php" cannot be in your file name.', 'simple-local-avatars' );
add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) );
+
return;
}
@@ -498,6 +913,7 @@ class Simple_Local_Avatars {
if ( is_wp_error( $avatar_id ) ) { // handle failures.
$this->avatar_upload_error = '
' . __( 'There was an error uploading the avatar:', 'simple-local-avatars' ) . ' ' . esc_html( $avatar_id->get_error_message() );
add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) );
+
return;
}
@@ -506,12 +922,12 @@ class Simple_Local_Avatars {
endif;
// Handle ratings
- if ( isset( $avatar_id ) || $avatar = get_user_meta( $user_id, 'simple_local_avatar', true ) ) {
+ if ( isset( $avatar_id ) || get_user_meta( $user_id, $this->user_key, true ) ) {
if ( empty( $_POST['simple_local_avatar_rating'] ) || ! array_key_exists( $_POST['simple_local_avatar_rating'], $this->avatar_ratings ) ) {
$_POST['simple_local_avatar_rating'] = key( $this->avatar_ratings );
}
- update_user_meta( $user_id, 'simple_local_avatar_rating', $_POST['simple_local_avatar_rating'] );
+ update_user_meta( $user_id, $this->rating_key, $_POST['simple_local_avatar_rating'] );
}
}
@@ -539,7 +955,7 @@ class Simple_Local_Avatars {
$this->avatar_delete( $user_id ); // delete old images if successful
if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
- echo get_simple_local_avatar( $user_id );
+ echo wp_kses_post( get_simple_local_avatar( $user_id ) );
}
}
@@ -565,7 +981,7 @@ class Simple_Local_Avatars {
$this->assign_new_user_avatar( $media_id, $user_id );
}
- echo get_simple_local_avatar( $user_id );
+ echo wp_kses_post( get_simple_local_avatar( $user_id ) );
die;
}
@@ -576,7 +992,7 @@ class Simple_Local_Avatars {
* @param int $user_id User ID.
*/
public function avatar_delete( $user_id ) {
- $old_avatars = (array) get_user_meta( $user_id, 'simple_local_avatar', true );
+ $old_avatars = (array) get_user_meta( $user_id, $this->user_key, true );
if ( empty( $old_avatars ) ) {
return;
@@ -599,8 +1015,8 @@ class Simple_Local_Avatars {
}
}
- delete_user_meta( $user_id, 'simple_local_avatar' );
- delete_user_meta( $user_id, 'simple_local_avatar_rating' );
+ delete_user_meta( $user_id, $this->user_key );
+ delete_user_meta( $user_id, $this->rating_key );
}
/**
@@ -613,13 +1029,13 @@ class Simple_Local_Avatars {
*/
public function unique_filename_callback( $dir, $name, $ext ) {
$user = get_user_by( 'id', (int) $this->user_id_being_edited );
- $name = $base_name = sanitize_file_name( $user->display_name . '_avatar_' . time() );
+ $name = $base_name = sanitize_file_name( $user->display_name . '_avatar_' . time() ); //phpcs:ignore
// ensure no conflicts with existing file names
$number = 1;
while ( file_exists( $dir . "/$name$ext" ) ) {
$name = $base_name . '_' . $number;
- $number++;
+ $number ++;
}
return $name . $ext;
@@ -658,10 +1074,11 @@ class Simple_Local_Avatars {
* @param object $user User object
*/
public function get_avatar_rest( $user ) {
- $local_avatar = get_user_meta( $user['id'], 'simple_local_avatar', true );
+ $local_avatar = get_user_meta( $user['id'], $this->user_key, true );
if ( empty( $local_avatar ) ) {
return;
}
+
return $local_avatar;
}
@@ -678,4 +1095,378 @@ class Simple_Local_Avatars {
public function set_avatar_rest( $input, $user ) {
$this->assign_new_user_avatar( $input['media_id'], $user->ID );
}
+
+ /**
+ * Short-circuit filter the `simple_local_avatars` option to match network if necessary
+ *
+ * @param bool $value Value of `simple_local_avatars` option, typically false.
+ *
+ * @return array
+ */
+ public function pre_option_simple_local_avatars( $value ) {
+ if ( SLA_IS_NETWORK && 'enforce' === $this->get_network_mode() ) {
+ $value = get_site_option( 'simple_local_avatars', array() );
+ }
+
+ return $value;
+ }
+
+ /**
+ * Set plugin defaults for a new site
+ *
+ * @param int $blog_id Blog ID.
+ */
+ public function set_defaults( $blog_id ) {
+ if ( 'enforce' === $this->get_network_mode() ) {
+ return;
+ }
+
+ switch_to_blog( $blog_id );
+ update_option( 'simple_local_avatars', $this->sanitize_options( $this->options ) );
+ restore_current_blog();
+ }
+
+ /**
+ * Add some basic styling on the Discussion page
+ */
+ public function admin_print_styles() {
+ ?>
+
+ is_enforced() ) {
+ $classes .= ' sla-enforced';
+ }
+
+ return $classes;
+ }
+
+ /**
+ * Overwriting existing avatar_ratings so this can be called just before the rating strings would be used so that
+ * translations will work correctly.
+ * Default text-domain because the strings have already been translated
+ */
+ private function update_avatar_ratings() {
+ $this->avatar_ratings = array(
+ 'G' => __( 'G — Suitable for all audiences' ),
+ 'PG' => __( 'PG — Possibly offensive, usually for audiences 13 and above' ),
+ 'R' => __( 'R — Intended for adult audiences above 17' ),
+ 'X' => __( 'X — Even more mature than above' ),
+ );
+ }
+
+ /**
+ * Clear user cache.
+ */
+ public function sla_clear_user_cache() {
+ check_ajax_referer( 'sla_clear_cache_nonce', 'nonce' );
+ $step = isset( $_REQUEST['step'] ) ? intval( $_REQUEST['step'] ) : 1;
+
+ // Setup defaults.
+ $users_per_page = 50;
+ $offset = ( $step - 1 ) * $users_per_page;
+
+ $users_query = new \WP_User_Query(
+ array(
+ 'fields' => array( 'ID' ),
+ 'number' => $users_per_page,
+ 'offset' => $offset,
+ )
+ );
+
+ // Total users in the site.
+ $total_users = $users_query->get_total();
+
+ // Get the users.
+ $users = $users_query->get_results();
+
+ if ( ! empty( $users ) ) {
+ foreach ( $users as $user ) {
+ $user_id = $user->ID;
+ $local_avatars = get_user_meta( $user_id, 'simple_local_avatar', true );
+ $media_id = isset( $local_avatars['media_id'] ) ? $local_avatars['media_id'] : '';
+ $this->clear_user_avatar_cache( $local_avatars, $user_id, $media_id );
+ }
+
+ wp_send_json_success(
+ array(
+ 'step' => $step + 1,
+ 'message' => sprintf(
+ /* translators: 1: Offset, 2: Total users */
+ esc_html__( 'Processing %1$s/%2$s users...', 'simple-local-avatars' ),
+ $offset,
+ $total_users
+ ),
+ )
+ );
+ }
+
+ wp_send_json_success(
+ array(
+ 'step' => 'done',
+ 'message' => sprintf(
+ /* translators: %s Total users */
+ esc_html__( 'Completed clearing cache for all %s user(s) avatars.', 'simple-local-avatars' ),
+ $total_users
+ ),
+ )
+ );
+ }
+
+ /**
+ * Clear avatar cache for given user.
+ *
+ * @param array $local_avatars Local avatars.
+ * @param int $user_id User ID.
+ * @param mixed $media_id Media ID.
+ */
+ private function clear_user_avatar_cache( $local_avatars, $user_id, $media_id ) {
+ if ( ! empty( $media_id ) ) {
+ $file_name_data = pathinfo( wp_get_original_image_path( $media_id ) );
+ $file_dir_name = $file_name_data['dirname'];
+ $file_name = $file_name_data['filename'];
+ $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 );
+ if ( ! file_exists( $file_size_path ) ) {
+ unset( $local_avatars[ $local_avatars_key ] );
+ }
+ }
+ }
+
+ // Update meta, remove sizes that don't exist.
+ update_user_meta( $user_id, 'simple_local_avatar', $local_avatars );
+ }
+ }
+
+ /**
+ * Add default avatar upload file field.
+ *
+ * @param array $defaults Default options for avatar.
+ *
+ * @return array Default options of avatar.
+ */
+ public function add_avatar_default_field( $defaults ) {
+ if ( ! did_action( 'wp_enqueue_media' ) ) {
+ wp_enqueue_media();
+ }
+ $default_avatar_file_url = '';
+ $default_avatar_file_id = get_option( 'simple_local_avatar_default', '' );
+ if ( ! empty( $default_avatar_file_id ) ) {
+ $default_avatar_file_url = wp_get_attachment_image_url( $default_avatar_file_id );
+ }
+ ob_start();
+ ?>
+
+
+
+ blog_id = 1;
+ $sites = array( $site );
+ }
+
+ // Bail early if we don't find sites.
+ if ( empty( $sites ) ) {
+ return $count;
+ }
+
+ foreach ( $sites as $site ) {
+ // Get the blog ID to use in the meta key and user query.
+ $blog_id = isset( $site->blog_id ) ? $site->blog_id : 1;
+
+ // Get the name of the meta key for WP User Avatar.
+ $meta_key = $wpdb->get_blog_prefix( $blog_id ) . 'user_avatar';
+
+ // Get processed users from database.
+ $migrations = get_option( 'simple_local_avatars_migrations', array() );
+ $processed_users = isset( $migrations['wp_user_avatar'] ) ? $migrations['wp_user_avatar'] : array();
+
+ // Get all users that have a local avatar.
+ $users = get_users(
+ array(
+ 'blog_id' => $blog_id,
+ 'exclude' => $processed_users,
+ 'meta_key' => $meta_key,
+ 'meta_compare' => 'EXISTS',
+ )
+ );
+
+ // Bail early if we don't find users.
+ if ( empty( $users ) ) {
+ continue;
+ }
+
+ foreach ( $users as $user ) {
+ // Get the existing avatar media ID.
+ $avatar_id = get_user_meta( $user->ID, $meta_key, true );
+
+ // Attach the user and media to Simple Local Avatars.
+ $sla = new Simple_Local_Avatars();
+ $sla->assign_new_user_avatar( (int) $avatar_id, $user->ID );
+
+ // Check that it worked.
+ $is_migrated = get_user_meta( $user->ID, 'simple_local_avatar', true );
+
+ if ( ! empty( $is_migrated ) ) {
+ // Build array of user IDs.
+ $migrations['wp_user_avatar'][] = $user->ID;
+
+ // Record the user IDs so we don't process a second time.
+ $is_saved = update_option( 'simple_local_avatars_migrations', $migrations );
+
+ // Record how many avatars we migrate to be used in our messaging.
+ if ( $is_saved ) {
+ $count ++;
+ }
+ }
+ }
+ }
+
+ return $count;
+ }
+
+ /**
+ * Migrate the user's avatar data away from WP User Avatar/ProfilePress via the dashboard.
+ *
+ * Sends the number of avatars processed back to the AJAX response before stopping execution.
+ *
+ * @return void
+ */
+ public function ajax_migrate_from_wp_user_avatar() {
+ // Bail early if nonce is not available.
+ if ( empty( sanitize_text_field( $_POST['migrateFromWpUserAvatarNonce'] ) ) ) {
+ die;
+ }
+
+ // Bail early if nonce is invalid.
+ if ( ! wp_verify_nonce( sanitize_text_field( $_POST['migrateFromWpUserAvatarNonce'] ), 'migrate_from_wp_user_avatar_nonce' ) ) {
+ die();
+ }
+
+ // Run the migration script and store the number of avatars processed.
+ $count = $this->migrate_from_wp_user_avatar();
+
+ // Create the array we send back to javascript here.
+ $array_we_send_back = array( 'count' => $count );
+
+ // Make sure to json encode the output because that's what it is expecting.
+ echo wp_json_encode( $array_we_send_back );
+
+ // Make sure you die when finished doing ajax output.
+ wp_die();
+
+ }
+
+ /**
+ * Migrate the user's avatar data from WP User Avatar/ProfilePress via the command line.
+ *
+ * ## OPTIONS
+ *
+ * [--yes]
+ * : Skips the confirmations (for automated systems).
+ *
+ * ## EXAMPLES
+ *
+ * $ wp simple-local-avatars migrate wp-user-avatar
+ * Success: Number of avatars successfully migrated from WP User Avatar: 5
+ *
+ * @param array $args The arguments.
+ * @param array $assoc_args The associative arguments.
+ *
+ * @return void
+ */
+ public function wp_cli_migrate_from_wp_user_avatar( $args, $assoc_args ) {
+
+ // Argument --yes to prevent confirmation (for automated systems).
+ if ( ! isset( $assoc_args['yes'] ) ) {
+ WP_CLI::confirm( esc_html__( 'Do you want to migrate avatars from WP User Avatar?', 'simple-local-avatars' ) );
+ }
+
+ // Run the migration script and store the number of avatars processed.
+ $count = $this->migrate_from_wp_user_avatar();
+
+ // Error out if we don't process any avatars.
+ if ( 0 === absint( $count ) ) {
+ WP_CLI::error( esc_html__( 'No avatars were migrated from WP User Avatar.', 'simple-local-avatars' ) );
+ }
+
+ WP_CLI::success(
+ sprintf(
+ '%s: %s',
+ esc_html__( 'Number of avatars successfully migrated from WP User Avatar', 'simple-local-avatars' ),
+ esc_html( $count )
+ )
+ );
+ }
}
diff --git a/wp-content/plugins/simple-local-avatars/readme.txt b/wp-content/plugins/simple-local-avatars/readme.txt
index 5c92ee11..38a0a2f6 100644
--- a/wp-content/plugins/simple-local-avatars/readme.txt
+++ b/wp-content/plugins/simple-local-avatars/readme.txt
@@ -3,9 +3,9 @@ Contributors: jakemgold, 10up, thinkoomph
Donate link: https://10up.com/plugins/simple-local-avatars-wordpress/
Tags: avatar, gravatar, user photos, users, profile
Requires at least: 4.6
-Tested up to: 5.5
-Requires PHP: 5.3
-Stable tag: 2.2.0
+Tested up to: 6.0
+Requires PHP: 5.6
+Stable tag: 2.4.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -41,33 +41,59 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei
== Changelog ==
-= 2.2.0 =
-* **Added:** `$args` parameter to `get_simple_local_avatar` function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/))
-* **Added:** `Simple_Local_Avatars::get_avatar_data()`, `Simple_Local_Avatars::get_simple_local_avatar_url()`, and `Simple_Local_Avatars::get_default_avatar_url()` methods (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/))
-* **Added:** Ability to retrieve avatar with `WP_Post` object (props [@oscarssanchez](https://profiles.wordpress.org/oscarssanchez), [@blobaugh](https://profiles.wordpress.org/blobaugh))
-* **Added:** class and ID to Avatar section on Profile Page to allow easier styling (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/))
-* **Added:** [WP Acceptance](https://github.com/10up/wpacceptance/) test coverage (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/))
-* **Changed:** Switched to `pre_get_avatar_data` filter (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/))
-* **Changed:** `assign_new_user_avatar` function to public (props [@tripflex](https://profiles.wordpress.org/tripflex/))
-* **Changed:** Split the main class into its own file, added unit tests, and set up testing GitHub action (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@helen](https://profiles.wordpress.org/helen/), [@stevegrunwell](https://profiles.wordpress.org/stevegrunwell/))
-* **Changed:** New plugin banner and icon (props [@JackieKjome](https://profiles.wordpress.org/jackiekjome/))
-* **Changed:** Bump WordPress version "tested up to" 5.5 (props [@Waka867](https://github.com/Waka867), [@tmoorewp](https://profiles.wordpress.org/tmoorewp), [@jeffpaul](https://profiles.wordpress.org/jeffpaul), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/))
-* **Changed:** GitHub Actions from HCL to YAML workflow syntax (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul))
-* **Changed:** Documentation updates (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul))
-* **Fixed:** Initialize `Simple_Local_Avatars` on the `$simple_local_avatars` global, enabling bundling plugin with composer (props [@pauldewouters](https://profiles.wordpress.org/pauldewouters/), [@adamsilverstein](https://profiles.wordpress.org/adamsilverstein))
-* **Removed:** `get_avatar` function that overrides the core function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/))
+= 2.4.0 - 2022-05-10 =
+* **Added:** Ability to set a default avatar. (props [@mehulkaklotar](https://github.com/mehulkaklotar), [@jeffpaul](https://github.com/jeffpaul), [@dinhtungdu](https://github.com/dinhtungdu), [@faisal-alvi](https://github.com/faisal-alvi) via [#96](https://github.com/10up/simple-local-avatars/pull/96)).
+* **Fixed:** Correct plugin name in changelog. (props [@grappler](https://github.com/grappler), [@jeffpaul](https://github.com/jeffpaul) via [#117](https://github.com/10up/simple-local-avatars/pull/117)).
+* **Fixed:** Avatar cache not being cleared. (props [@thefrosty](https://github.com/thefrosty), [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#118](https://github.com/10up/simple-local-avatars/pull/118) & [#120](https://github.com/10up/simple-local-avatars/pull/120)).
+* **Security:** Dev dependency `@wordpress/scripts` upgraded to resolve deeper level dependency security issues. (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@cadic](https://github.com/cadic) via [#119](https://github.com/10up/simple-local-avatars/pull/119)).
-= 2.1.1 =
+= 2.3.0 - 2022-04-25 =
+* **Added:** Crop screen (props [@jeffpaul](https://github.com/jeffpaul), [@helen](https://github.com/helen), [@ajmaurya99](https://github.com/ajmaurya99), [@Antonio-Lagun](https://github.com/Antonio-Lagun), [@faisal-alvi](https://github.com/faisal-alvi)).
+* **Added:** Avatar preview for Subscribers (props [@ankitguptaindia](https://github.com/ankitguptaindia), [@dinhtungdu](https://github.com/dinhtungdu), [@dkotter](https://github.com/dkotter)).
+* **Added:** More robust multisite support and shared avatar setting (props [@adamsilverstein](https://github.com/adamsilverstein), [@helen](https://github.com/helen), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@faisal-alvi](https://github.com/faisal-alvi), [@holle75](https://github.com/holle75)).
+* **Added:** Settings link to plugin action links (props [@rahulsprajapati](https://github.com/rahulsprajapati), [@jeffpaul](https://github.com/jeffpaul), [@iamdharmesh](https://github.com/iamdharmesh)).
+* **Added:** Dashboard setting and WP-CLI command to migrate avatars from [WP User Avatar](https://wordpress.org/plugins/wp-user-avatar/) (props [@jeffpaul](https://github.com/jeffpaul), [@claytoncollie](https://github.com/claytoncollie), [@helen](https://github.com/helen), [@faisal-alvi](https://github.com/faisal-alvi)).
+* **Added:** Option to clear cache of user meta to remove image sizes that do not exist (props [@jeffpaul](https://github.com/jeffpaul), [@ituk](https://github.com/ituk), [@dinhtungdu](https://github.com/dinhtungdu), [@sparkbold](https://github.com/sparkbold), [@thrijith](https://github.com/thrijith)).
+* **Added:** Package file (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@claytoncollie](https://github.com/claytoncollie), [@cadic](https://github.com/cadic)).
+* **Added:** PHP Unit Tests (props [@faisal-alvi](https://github.com/faisal-alvi), [@iamdharmesh](https://github.com/iamdharmesh)).
+* **Added:** "No Response" GitHub Action (props [@jeffpaul](https://github.com/jeffpaul)).
+* **Changed:** Bump WordPress "tested up to" version to 5.9 (props [@jeffpaul](https://github.com/jeffpaul), [@ankitguptaindia](https://github.com/ankitguptaindia), [@dinhtungdu](https://github.com/dinhtungdu), [@phpbits](https://github.com/phpbits)).
+* **Changed:** Bump WordPress "tested up to" version to 6.0 (props [@ajmaurya99](https://github.com/ajmaurya99) via [#110](https://github.com/10up/simple-local-avatars/pull/110)).
+* **Changed:** Format admin script (props [@thrijith](https://github.com/thrijith), [@dinhtungdu](https://github.com/dinhtungdu)).
+* **Fixed:** Media ID as string in REST API (props [@diodoe](https://github.com/diodoe), [@dinhtungdu](https://github.com/dinhtungdu), [@dkotter](https://github.com/dkotter)).
+* **Fixed:** Avatar rating text is not translated properly if a user has a custom language Set (props [@ActuallyConnor](https://github.com/ActuallyConnor), [@faisal-alvi](https://github.com/faisal-alvi)).
+* **Security:** PHP 8 compatibility (props [@faisal-alvi](https://github.com/faisal-alvi), [@dkotter](https://github.com/dkotter), [@Sidsector9](https://github.com/Sidsector9)).
+* **Security:** Bump `rmccue/requests` from 1.7.0 to 1.8.0 (props [dependabot@](https://github.com/dependabot)).
+* **Security:** Bump `nanoid` from 3.1.28 to 3.2.0 (props [dependabot@](https://github.com/dependabot)).
+* **Security:** Bump `minimist` from 1.2.5 to 1.2.6 (props [dependabot@](https://github.com/dependabot)).
+
+= 2.2.0 - 2020-10-27 =
+* **Added:** `$args` parameter to `get_simple_local_avatar` function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)).
+* **Added:** `Simple_Local_Avatars::get_avatar_data()`, `Simple_Local_Avatars::get_simple_local_avatar_url()`, and `Simple_Local_Avatars::get_default_avatar_url()` methods (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)).
+* **Added:** Ability to retrieve avatar with `WP_Post` object (props [@oscarssanchez](https://profiles.wordpress.org/oscarssanchez), [@blobaugh](https://profiles.wordpress.org/blobaugh)).
+* **Added:** class and ID to Avatar section on Profile Page to allow easier styling (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)).
+* **Added:** [WP Acceptance](https://github.com/10up/wpacceptance/) test coverage (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)).
+* **Changed:** Switched to `pre_get_avatar_data` filter (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)).
+* **Changed:** `assign_new_user_avatar` function to public (props [@tripflex](https://profiles.wordpress.org/tripflex/)).
+* **Changed:** Split the main class into its own file, added unit tests, and set up testing GitHub action (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@helen](https://profiles.wordpress.org/helen/), [@stevegrunwell](https://profiles.wordpress.org/stevegrunwell/)).
+* **Changed:** New plugin banner and icon (props [@JackieKjome](https://profiles.wordpress.org/jackiekjome/)).
+* **Changed:** Bump WordPress version "tested up to" 5.5 (props [@Waka867](https://github.com/Waka867), [@tmoorewp](https://profiles.wordpress.org/tmoorewp), [@jeffpaul](https://profiles.wordpress.org/jeffpaul), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)).
+* **Changed:** GitHub Actions from HCL to YAML workflow syntax (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul)).
+* **Changed:** Documentation updates (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul)).
+* **Fixed:** Initialize `Simple_Local_Avatars` on the `$simple_local_avatars` global, enabling bundling plugin with composer (props [@pauldewouters](https://profiles.wordpress.org/pauldewouters/), [@adamsilverstein](https://profiles.wordpress.org/adamsilverstein)).
+* **Removed:** `get_avatar` function that overrides the core function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)).
+
+= 2.1.1 - 2019-05-07 =
* Fixed: Do not delete avatars just because they don't exist on the local filesystem. This was occasionally dumping avatars when WordPress uploads were stored elsewhere, e.g. a cloud service.
-= 2.1 =
+= 2.1 - 2018-10-24 =
* *New:* All avatar uploads now go into the media library. Don't worry - users without the ability to upload files cannot otherwise see the contents of your media library. This allows local avatars to respect other functionality your site may have around uploaded images, such as external hosting.
* *New:* REST API support for getting and updating.
* *New:* Use .org language packs rather than bundling translations.
* *Fixed:* Avoid an `ArgumentCountError`.
* *Fixed:* A couple of internationalization issues.
-= 2.0 =
+= 2.0 - 2013-06-02 =
* Choose or upload an avatar from the media library (for users with appropriate capabilities)!
* Local avatars are rated for appropriateness, just like Gravatar
* A new setting under Discussion enables administrators to turn off Gravatar (only use local avatars)
@@ -80,49 +106,52 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei
* Hungarian translation added (needs further updating again with new version)
* Assorted refactoring / improvements under the hood
-= 1.3.1 =
+= 1.3.1 - 2011-12-29 =
* Brazilian Portuguese and Belarusian translations
* Bug fixes (most notably correct naming of image files based on user display name)
* Optimization for WordPress 3.2 / 3.3 (substitutes deprecated function)
-= 1.3 =
+= 1.3 - 2011-09-22 =
* Avatar file name saved as "user-display-name_avatar" (or other image extension)
* Russian localization added
* Assorted minor code optimizations
-= 1.2.4 =
+= 1.2.4 - 2011-07-02 =
* Support for front end avatar uploads (e.g. Theme My Profile)
-= 1.2.3 =
+= 1.2.3 - 2011-04-04 =
* Russian localization
-= 1.2.2 =
+= 1.2.2 - 2011-03-25 =
* Fix for avatars uploaded pre-1.2.1 having a broken path after upgrade
-= 1.2.1 =
+= 1.2.1 - 2011-01-26 =
* French localization
* Simplify uninstall code
-= 1.2 =
+= 1.2 - 2011-01-26 =
* Fix path issues on some IIS servers (resulting in missing avatar images)
* Fix rare uninstall issues related to deleted avatars
* Spanish localization
* Other minor under the hood optimizations
-= 1.1.3 =
+= 1.1.3 - 2011-01-20 =
* Properly deletes old avatars upon changing avatar
* Fixes "foreach" warning in debug mode when updating avatar image
-= 1.1.2 =
+= 1.1.2 - 2011-01-18 =
* Norwegian localization
-= 1.1.1 =
+= 1.1.1 - 2011-01-18 =
* Italian localization
-= 1.1 =
+= 1.1 - 2011-01-18 =
* All users (regardless of capabilities) can upload avatars by default. To limit avatar uploading to users with upload files capabilities (Authors and above), check the applicable option under Settings > Discussion. This was the default behavior in 1.0.
* Localization support; German included
+= 1.0 - 2011-01-18 =
+* Initial release.
+
== Upgrade Notice ==
= 2.1 =
@@ -132,4 +161,4 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei
Upgraded to take advantage of *WordPress 3.5 and newer*. Does not support older versions! This has also *not* been tested with front end profile plug-ins - feedback welcome. Note that several language strings have been added or modified - revised translations would be welcome!
= 1.3.1 =
-Like WordPress 3.2, now *REQUIRES* PHP 5.2 or newer.
+Like WordPress 3.2, now *REQUIRES* PHP 5.2 or newer.
\ No newline at end of file
diff --git a/wp-content/plugins/simple-local-avatars/simple-local-avatars.dev.js b/wp-content/plugins/simple-local-avatars/simple-local-avatars.dev.js
deleted file mode 100644
index 69d3d513..00000000
--- a/wp-content/plugins/simple-local-avatars/simple-local-avatars.dev.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var simple_local_avatar_frame, avatar_spinner, avatar_ratings, avatar_container, avatar_form_button;
-var avatar_working = false;
-
-jQuery(document).ready(function($){
- $( document.getElementById('simple-local-avatar-media') ).on( 'click', function(event) {
- event.preventDefault();
-
- if ( avatar_working )
- return;
-
- if ( simple_local_avatar_frame ) {
- simple_local_avatar_frame.open();
- return;
- }
-
- simple_local_avatar_frame = wp.media.frames.simple_local_avatar_frame = wp.media({
- title: i10n_SimpleLocalAvatars.insertMediaTitle,
- button: { text: i10n_SimpleLocalAvatars.insertIntoPost },
- library : { type : 'image'},
- multiple: false
- });
-
- simple_local_avatar_frame.on( 'select', function() {
- // We set multiple to false so only get one image from the uploader
- avatar_lock('lock');
- var avatar_url = simple_local_avatar_frame.state().get('selection').first().toJSON().id;
- jQuery.post( ajaxurl, { action: 'assign_simple_local_avatar_media', media_id: avatar_url, user_id: i10n_SimpleLocalAvatars.user_id, _wpnonce: i10n_SimpleLocalAvatars.mediaNonce }, function(data) {
- if ( data != '' ) {
- avatar_container.innerHTML = data;
- $( document.getElementById('simple-local-avatar-remove') ).show();
- avatar_ratings.disabled = false;
- avatar_lock('unlock');
- }
- });
- });
-
- simple_local_avatar_frame.open();
- });
-
- $( document.getElementById('simple-local-avatar-remove') ).on('click',function(event){
- event.preventDefault();
-
- if ( avatar_working )
- return;
-
- avatar_lock('lock');
- $.get( ajaxurl, { action: 'remove_simple_local_avatar', user_id: i10n_SimpleLocalAvatars.user_id, _wpnonce: i10n_SimpleLocalAvatars.deleteNonce })
- .done(function(data) {
- if ( data != '' ) {
- avatar_container.innerHTML = data;
- $( document.getElementById('simple-local-avatar-remove') ).hide();
- avatar_ratings.disabled = true;
- avatar_lock('unlock');
- }
- });
- });
-});
-
-function avatar_lock( lock_or_unlock ) {
- if ( undefined == avatar_spinner ) {
- avatar_ratings = document.getElementById('simple-local-avatar-ratings');
- avatar_spinner = jQuery( document.getElementById('simple-local-avatar-spinner') );
- avatar_container = document.getElementById('simple-local-avatar-photo');
- avatar_form_button = jQuery(avatar_ratings).closest('form').find('input[type=submit]');
- }
-
- if ( lock_or_unlock == 'unlock' ) {
- avatar_working = false;
- avatar_form_button.removeAttr('disabled');
- avatar_spinner.hide();
- } else {
- avatar_working = true;
- avatar_form_button.attr('disabled','disabled');
- avatar_spinner.show();
- }
-}
\ No newline at end of file
diff --git a/wp-content/plugins/simple-local-avatars/simple-local-avatars.js b/wp-content/plugins/simple-local-avatars/simple-local-avatars.js
deleted file mode 100644
index 1a20564f..00000000
--- a/wp-content/plugins/simple-local-avatars/simple-local-avatars.js
+++ /dev/null
@@ -1 +0,0 @@
-function avatar_lock(e){if(undefined==avatar_spinner){avatar_ratings=document.getElementById("simple-local-avatar-ratings");avatar_spinner=jQuery(document.getElementById("simple-local-avatar-spinner"));avatar_container=document.getElementById("simple-local-avatar-photo");avatar_form_button=jQuery(avatar_ratings).closest("form").find("input[type=submit]")}if(e=="unlock"){avatar_working=false;avatar_form_button.removeAttr("disabled");avatar_spinner.hide()}else{avatar_working=true;avatar_form_button.attr("disabled","disabled");avatar_spinner.show()}}var simple_local_avatar_frame,avatar_spinner,avatar_ratings,avatar_container,avatar_form_button;var avatar_working=false;jQuery(document).ready(function(e){e(document.getElementById("simple-local-avatar-media")).on("click",function(t){t.preventDefault();if(avatar_working)return;if(simple_local_avatar_frame){simple_local_avatar_frame.open();return}simple_local_avatar_frame=wp.media.frames.simple_local_avatar_frame=wp.media({title:i10n_SimpleLocalAvatars.insertMediaTitle,button:{text:i10n_SimpleLocalAvatars.insertIntoPost},library:{type:"image"},multiple:false});simple_local_avatar_frame.on("select",function(){avatar_lock("lock");var t=simple_local_avatar_frame.state().get("selection").first().toJSON().id;jQuery.post(ajaxurl,{action:"assign_simple_local_avatar_media",media_id:t,user_id:i10n_SimpleLocalAvatars.user_id,_wpnonce:i10n_SimpleLocalAvatars.mediaNonce},function(t){if(t!=""){avatar_container.innerHTML=t;e(document.getElementById("simple-local-avatar-remove")).show();avatar_ratings.disabled=false;avatar_lock("unlock")}})});simple_local_avatar_frame.open()});e(document.getElementById("simple-local-avatar-remove")).on("click",function(t){t.preventDefault();if(avatar_working)return;avatar_lock("lock");e.get(ajaxurl,{action:"remove_simple_local_avatar",user_id:i10n_SimpleLocalAvatars.user_id,_wpnonce:i10n_SimpleLocalAvatars.deleteNonce}).done(function(t){if(t!=""){avatar_container.innerHTML=t;e(document.getElementById("simple-local-avatar-remove")).hide();avatar_ratings.disabled=true;avatar_lock("unlock")}})})})
\ No newline at end of file
diff --git a/wp-content/plugins/simple-local-avatars/simple-local-avatars.php b/wp-content/plugins/simple-local-avatars/simple-local-avatars.php
index 172b5f97..30bef3f1 100644
--- a/wp-content/plugins/simple-local-avatars/simple-local-avatars.php
+++ b/wp-content/plugins/simple-local-avatars/simple-local-avatars.php
@@ -3,18 +3,30 @@
* 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.2.0
+ * Version: 2.4.0
* Requires at least: 4.6
- * Requires PHP: 5.3
+ * Requires PHP: 5.6
* Author: Jake Goldman, 10up
* Author URI: https://10up.com
* License: GPLv2 or later
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
* Text Domain: simple-local-avatars
+ *
+ * @package SimpleLocalAvatars
*/
+define( 'SLA_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
+
require_once dirname( __FILE__ ) . '/includes/class-simple-local-avatars.php';
+// Global constants.
+define( 'SLA_VERSION', '2.2.0' );
+define( 'SLA_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+
+if ( ! defined( 'SLA_IS_NETWORK' ) ) {
+ define( 'SLA_IS_NETWORK', Simple_Local_Avatars::is_network( plugin_basename( __FILE__ ) ) );
+}
+
/**
* Init the plugin.
*/
@@ -57,4 +69,5 @@ function simple_local_avatars_uninstall() {
endforeach;
delete_option( 'simple_local_avatars' );
+ delete_option( 'simple_local_avatars_migrations' );
}