Merge branch 'master' into develop

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
+ * 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';
+	const version = '1.14.3';
 
 	private static $instance;
 

includes/class-admin-welcome.php

@@ -276,6 +276,16 @@ public function changelog_screen() {
 
 				<hr />
 
+				<h3>1.14.2 &amp; 1.14.3 on September 17</h3>
+				<ul>
+					<li>Fixed: Issue affecting Gravity Forms User Registration Addon. Passwords were being reset when an user edited their own entry.</li>
+				</ul>
+
+				<h3>1.14.1 on September 16</h3>
+				<ul>
+					<li>Fixed: Error with older versions of Maps Premium View</li>
+				</ul>
+
 				<h3>1.14 on September 16</h3>
 
 				<ul>

includes/class-gravityview-extension.php

@@ -12,7 +12,7 @@
  *
  * @since 1.1
  *
- * @version 1.1
+ * @version 1.1.1
  */
 abstract class GravityView_Extension {
 
@@ -21,12 +21,6 @@ abstract class GravityView_Extension {
 	 */
 	protected $_title = NULL;
 
-	/**
-	 * @since 1.1
-	 * @var string Path to the base plugin file, normally `__FILE__`
-	 */
-	protected $_path = NULL;
-
 	/**
 	 * @var string Version number of the plugin
 	 */

includes/extensions/edit-entry/class-edit-entry-user-registration.php

@@ -117,7 +117,7 @@ public function restore_user_details( $user_id = 0, $config = array(), $entry =
 
         $restored_user = $user_after_update;
 
-        // Restore previous display_name
+	    // Restore previous display_name
         $restored_user->display_name = $this->_user_before_update->display_name;
 
         // Restore previous roles
@@ -126,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

readme.txt

@@ -20,6 +20,9 @@ Beautifully display your Gravity Forms entries. Learn more on [gravityview.co](h
 
 == Changelog ==
 
+= 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