Merge branch 'dev'

init.php

@@ -3,7 +3,7 @@
  * Plugin Name: Basic User Avatars
  * Plugin URI:  https://wordpress.org/plugins/basic-user-avatars/
  * Description: Add an avatar upload field on frontend pages and Edit Profile screen so users can add a custom profile picture.
- * Version:     1.0.6
+ * Version:     1.0.7
  * Author:      Stranger Studios
  * Author URI:  https://www.strangerstudios.com/
  * Text Domain: basic-user-avatars
@@ -396,7 +396,7 @@ function shortcode() {
 
 		ob_start();
 		?>
-		<form id="basic-user-avatar-form" action="<?php the_permalink(); ?>" method="post" enctype="multipart/form-data">
+		<form id="basic-user-avatar-form" method="post" enctype="multipart/form-data">
 			<?php
 			echo get_avatar( $profileuser->ID );
 
@@ -411,7 +411,7 @@ function shortcode() {
 				if ( empty( $profileuser->basic_user_avatar ) ) {
 					echo '<p class="description">' . apply_filters( 'bu_avatars_no_avatar_set_text',esc_html__( 'No local avatar is set. Use the upload field to add a local avatar.', 'basic-user-avatars' ), $profileuser ) . '</p>';
 				} else {
-					echo '<p><input type="checkbox" name="basic-user-avatar-erase" value="1" /> <label for="basic-user-avatar-erase">' . apply_filters( 'bu_avatars_delete_avatar_text', esc_html__( 'Delete local avatar', 'basic-user-avatars' ), $profileuser ) . '</label></p>';
+					echo '<p><input type="checkbox" name="basic-user-avatar-erase" id="basic-user-avatar-erase" value="1" /> <label for="basic-user-avatar-erase">' . apply_filters( 'bu_avatars_delete_avatar_text', esc_html__( 'Delete local avatar', 'basic-user-avatars' ), $profileuser ) . '</label></p>';					
 					echo '<p class="description">' . apply_filters( 'bu_avatars_replace_avatar_text', esc_html__( 'Replace the local avatar by uploading a new avatar, or erase the local avatar (falling back to a gravatar) by checking the delete option.', 'basic-user-avatars' ), $profileuser ) . '</p>';
 				}
 
@@ -459,7 +459,7 @@ public function bbpress_user_profile() {
 					if ( empty( $profileuser->basic_user_avatar ) ) {
 						echo '<span class="description" style="margin-left:0;">' . apply_filters( 'bu_avatars_no_avatar_set_text', esc_html__( 'No local avatar is set. Use the upload field to add a local avatar.', 'basic-user-avatars' ), $profileuser ) . '</span>';
 					} else {
-						echo '<input type="checkbox" name="basic-user-avatar-erase" value="1" style="width:auto" /> ' . apply_filters( 'bu_avatars_delete_avatar_text', __( 'Delete local avatar', 'basic-user-avatars' ), $profileuser ) . '<br />';
+							echo '<input type="checkbox" name="basic-user-avatar-erase" id="basic-user-avatar-erase" value="1" style="width:auto" /> <label for="basic-user-avatar-erase">' . apply_filters( 'bu_avatars_delete_avatar_text', __( 'Delete local avatar', 'basic-user-avatars' ), $profileuser ) . '<label><br />';
 						echo '<span class="description" style="margin-left:0;">' . apply_filters( '', esc_html__( 'Replace the local avatar by uploading a new avatar, or erase the local avatar (falling back to a gravatar) by checking the delete option.', 'basic-user-avatars' ), $profileuser ) . '</span>';
 					}
 

languages/Basic-User-Avatars.po

@@ -0,0 +1,35 @@
+# Copyright (C) 2022 Stranger Studios
+# This file is distributed under the same license as the Basic User Avatars plugin.
+msgid ""
+msgstr ""
+"Project-Id-Version: Basic User Avatars 1.0.6\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"Last-Translator: Paid Memberships Pro <[email protected]>\n"
+"Language-Team: Paid Memberships Pro <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2022-07-14T11:56:20+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.6.0\n"
+"X-Domain: Basic-User-Avatars\n"
+
+#. Plugin Name of the plugin
+msgid "Basic User Avatars"
+msgstr ""
+
+#. Plugin URI of the plugin
+msgid "https://wordpress.org/plugins/basic-user-avatars/"
+msgstr ""
+
+#. Description of the plugin
+msgid "Add an avatar upload field on frontend pages and Edit Profile screen so users can add a custom profile picture."
+msgstr ""
+
+#. Author of the plugin
+msgid "Stranger Studios"
+msgstr ""
+
+#. Author URI of the plugin
+msgid "https://www.strangerstudios.com/"
+msgstr ""

languages/Basic-User-Avatars.pot

@@ -0,0 +1,35 @@
+# Copyright (C) 2022 Stranger Studios
+# This file is distributed under the same license as the Basic User Avatars plugin.
+msgid ""
+msgstr ""
+"Project-Id-Version: Basic User Avatars 1.0.6\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"Last-Translator: Paid Memberships Pro <[email protected]>\n"
+"Language-Team: Paid Memberships Pro <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2022-07-14T11:56:20+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.6.0\n"
+"X-Domain: Basic-User-Avatars\n"
+
+#. Plugin Name of the plugin
+msgid "Basic User Avatars"
+msgstr ""
+
+#. Plugin URI of the plugin
+msgid "https://wordpress.org/plugins/basic-user-avatars/"
+msgstr ""
+
+#. Description of the plugin
+msgid "Add an avatar upload field on frontend pages and Edit Profile screen so users can add a custom profile picture."
+msgstr ""
+
+#. Author of the plugin
+msgid "Stranger Studios"
+msgstr ""
+
+#. Author URI of the plugin
+msgid "https://www.strangerstudios.com/"
+msgstr ""

languages/basic-user-avatars.pot

@@ -1,83 +1,35 @@
-# Copyright (C) 2015 Basic User Avatars
-# This file is distributed under the same license as the Basic User Avatars package.
+# Copyright (C) 2022 Stranger Studios
+# This file is distributed under the same license as the Basic User Avatars plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Basic User Avatars 1.0.1\n"
-"Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/basic-user-"
-"avatars\n"
-"POT-Creation-Date: 2015-04-17 13:57:40+00:00\n"
+"Project-Id-Version: Basic User Avatars 1.0.6\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"Last-Translator: Paid Memberships Pro <[email protected]>\n"
+"Language-Team: Paid Memberships Pro <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"POT-Creation-Date: 2022-07-14T11:56:20+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.6.0\n"
+"X-Domain: Basic-User-Avatars\n"
 
-#: init.php:98
-msgid "Local Avatar Permissions"
-msgstr ""
-
-#: init.php:112
-msgid ""
-"Only allow users with file upload capabilities to upload local avatars "
-"(Authors and above)"
-msgstr ""
-
-#: init.php:206 init.php:369
-msgid "Avatar"
-msgstr ""
-
-#: init.php:209
-msgid "Upload Avatar"
-msgstr ""
-
-#: init.php:224 init.php:335 init.php:382
-msgid "No local avatar is set. Use the upload field to add a local avatar."
-msgstr ""
-
-#: init.php:226 init.php:337 init.php:384
-msgid "Delete local avatar"
-msgstr ""
-
-#: init.php:227 init.php:338 init.php:385
-msgid ""
-"Replace the local avatar by uploading a new avatar, or erase the local "
-"avatar (falling back to a gravatar) by checking the delete option."
-msgstr ""
-
-#: init.php:232 init.php:343 init.php:390
-msgid "No local avatar is set. Set up your avatar at Gravatar.com."
-msgstr ""
-
-#: init.php:234 init.php:345 init.php:392
-msgid ""
-"You do not have media management permissions. To change your local avatar, "
-"contact the site administrator."
-msgstr ""
-
-#: init.php:349
-msgid "Update Avatar"
-msgstr ""
-
-#. Plugin Name of the plugin/theme
+#. Plugin Name of the plugin
 msgid "Basic User Avatars"
 msgstr ""
 
-#. Plugin URI of the plugin/theme
-msgid "http://wordpress.org/extend/basic-user-avatars"
+#. Plugin URI of the plugin
+msgid "https://wordpress.org/plugins/basic-user-avatars/"
 msgstr ""
 
-#. Description of the plugin/theme
-msgid ""
-"Adds an avatar upload field to user profiles. Also provides front-end avatar "
-"management via a shortcode and bbPress support. No frills. Fork of Simple "
-"Local Avatars 1.3."
+#. Description of the plugin
+msgid "Add an avatar upload field on frontend pages and Edit Profile screen so users can add a custom profile picture."
 msgstr ""
 
-#. Author of the plugin/theme
-msgid "Jared Atchison"
+#. Author of the plugin
+msgid "Stranger Studios"
 msgstr ""
 
-#. Author URI of the plugin/theme
-msgid "http://jaredatchison.com"
+#. Author URI of the plugin
+msgid "https://www.strangerstudios.com/"
 msgstr ""

readme.txt

@@ -2,8 +2,8 @@
 Contributors: strangerstudios, jaredatch
 Tags: avatar, gravatar, user profile, users, profile
 Requires at least: 5.2
-Tested up to: 5.9
-Stable tag: 1.0.6
+Tested up to: 6.0
+Stable tag: 1.0.7
 
 Add an avatar upload field on frontend pages and Edit Profile screen so users can add a custom profile picture.
 
@@ -56,6 +56,11 @@ If things are still not functioning properly then proceed to reporting an issue.
 1. Avatar upload field on the Edit User screen in the WordPress admin.
 
 == Changelog ==
+= 1.0.7 =
+* ENHANCEMENT: Made "Delete Local Avatar" checkbox text clickable for frontend. (Thanks @pinguluk )
+* BUG FIX: Fixed an issue where Avatars weren't saving correctly when changing an existing uploaded avatar. (Thanks @jarrydlong)
+* BUG FIX: Fixed an issue where Avatars weren't saving on the frontend in certain cases. (Thanks @amatzin)
+* BUG FIX: Fixed deprecation warnings when getting the Avatar for PHP 8+ (Thanks @ZebulanStanphill)
 
 = 1.0.6 =
 * ENHANCEMENT: Added translation for German locale. Thanks @olpo24