From f93875254d364dc02586053d52af35d63ea5e6b0 Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Thu, 17 Sep 2015 12:01:58 -0600 Subject: [PATCH] Don't have WP update the password --- gravityview.php | 4 ++-- includes/class-admin-welcome.php | 4 ++-- .../edit-entry/class-edit-entry-user-registration.php | 11 +++++------ readme.txt | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gravityview.php b/gravityview.php index b49c40ac66..574569de21 100644 --- a/gravityview.php +++ b/gravityview.php @@ -16,7 +16,7 @@ * Plugin Name: GravityView * Plugin URI: http://gravityview.co * Description: Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output. - * Version: 1.14.2 + * Version: 1.14.3 * Author: Katz Web Services, Inc. * Author URI: http://www.katzwebservices.com * Text Domain: gravityview @@ -89,7 +89,7 @@ */ final class GravityView_Plugin { - const version = '1.14.2'; + const version = '1.14.3'; private static $instance; diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index ec3ea5206d..1bc6d7320c 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -276,9 +276,9 @@ public function changelog_screen() {
-

1.14.2 on September 16

+

1.14.2 & 1.14.3 on September 17

1.14.1 on September 16

diff --git a/includes/extensions/edit-entry/class-edit-entry-user-registration.php b/includes/extensions/edit-entry/class-edit-entry-user-registration.php index 48e2a6f23d..3bde01ed8d 100644 --- a/includes/extensions/edit-entry/class-edit-entry-user-registration.php +++ b/includes/extensions/edit-entry/class-edit-entry-user-registration.php @@ -109,19 +109,15 @@ public function update_user( $form = array(), $entry_id = 0 ) { * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon * @param array $config Gravity Forms User Registration Addon form feed configuration * @param array $entry The Gravity Forms entry that was just updated - * @param string $password User password * @return void */ - public function restore_user_details( $user_id = 0, $config = array(), $entry = array(), $password = '' ) { + public function restore_user_details( $user_id = 0, $config = array(), $entry = array() ) { $user_after_update = get_userdata( $user_id ); $restored_user = $user_after_update; - // Restore the password - $restored_user->user_pass = $password; - - // Restore previous display_name + // Restore previous display_name $restored_user->display_name = $this->_user_before_update->display_name; // Restore previous roles @@ -130,6 +126,9 @@ public function restore_user_details( $user_id = 0, $config = array(), $entry = $restored_user->add_role( $role ); } + // Don't have WP update the password. + unset( $restored_user->data->user_pass ); + /** * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView * @since 1.14 diff --git a/readme.txt b/readme.txt index a72289708c..693ca66cb8 100644 --- a/readme.txt +++ b/readme.txt @@ -20,8 +20,8 @@ Beautifully display your Gravity Forms entries. Learn more on [gravityview.co](h == Changelog == -= 1.14.2 on September 17 = -* Fixed: Issue affecting Gravity Forms User Registration Addon. Passwords were being reset when editing an entry. += 1.14.2 & 1.14.3 on September 17 = +* Fixed: Issue affecting Gravity Forms User Registration Addon. Passwords were being reset when an user edited their own entry. = 1.14.1 on September 16 = * Fixed: Error with older versions of Maps Premium View