Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

README.md

@@ -7,7 +7,7 @@ Ultimate Member is the #1 user profile & membership plugin for WordPress. The pl
 
 | Latest Version |Requires at least|Stable Tag|
 | :------------: |:------------:|:------------:|
-| 2.0.22 | WordPress 4.9 or higher| 2.0.22 |
+| 2.0.23 | WordPress 4.9 or higher| 2.0.23 |
 
 
 Features of the plugin include:
@@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version
 
 Releases
 ====================
-[Official Release Version: 2.0.22](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.22).
+[Official Release Version: 2.0.23](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.23).
 
 [Official Release Version: 1.3.88](https://github.com/ultimatemember/ultimatemember/releases).
 

includes/admin/core/packages/2.0-beta1/user_roles.php

@@ -133,7 +133,11 @@ if ( ! empty( $um_roles ) ) {
 						}
 					}
 				} elseif ( '_um_profilec_upgrade_role' == $metakey ) {
-					$metadata = $roles_associations[ $metadata ];
+					if ( isset( $roles_associations[ $metadata ] ) ) {
+						$metadata = $roles_associations[ $metadata ];
+					} else {
+						$metadata = '';
+					}
 				}
 
 				$role_meta[ $metakey ] = $metadata;
@@ -149,6 +153,7 @@ update_option( 'um_roles', $role_keys );
 global $wp_roles, $wp_version;
 if ( version_compare( $wp_version, '4.9', '<' ) ) {
 	$wp_roles->_init();
+	$wp_roles->reinit();
 } elseif ( method_exists( $wp_roles, 'for_site' ) ) {
 	$wp_roles->for_site( get_current_blog_id() );
 }

includes/class-dependencies.php

@@ -48,7 +48,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 			'profile-completeness'  => '2.0.1',
 			'recaptcha'             => '2.0.2',
 			'reviews'               => '2.0.3',
-			'social-activity'       => '2.0.1',
+			'social-activity'       => '2.0.6',
 			'social-login'          => '2.0.1',
 			'terms-conditions'      => '2.0',
 			'user-location'         => '2.0',

includes/class-init.php

@@ -553,7 +553,7 @@ if ( ! class_exists( 'UM' ) ) {
 			$this->mobile();
 			$this->external_integrations();
 			$this->gdpr();
-			$this->uploader();
+			//$this->uploader();
 			
 		}
 

includes/core/class-shortcodes.php

@@ -265,6 +265,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				unset( $args['theme_file'] );
 				unset( $args['tpl'] );
 
+				$args = apply_filters( 'um_template_load_args', $args, $tpl );
+
 				extract( $args );
 			}
 

includes/core/class-user.php

@@ -1660,7 +1660,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			 * }
 			 * ?>
 			 */
-			$changes = apply_filters('um_before_update_profile', $changes, $this->id );
+			$changes = apply_filters( 'um_before_update_profile', $changes, $args['ID'] );
 
 			foreach ( $changes as $key => $value ) {
 				if ( ! in_array( $key, $this->update_user_keys ) ) {

readme.txt

@@ -4,9 +4,9 @@ Plugin URI: https://ultimatemember.com/
 Contributors: ultimatemember, champsupertramp, nsinelnikov
 Donate link: 
 Tags: community, member, membership, user-profile, user-registration
-Requires at least: 4.1
+Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 2.0.22
+Stable tag: 2.0.23
 License: GNU Version 2 or Any Later Version
 License URI: http://www.gnu.org/licenses/gpl-3.0.txt
 
@@ -131,7 +131,12 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
 
 = Important: UM2.0+ is a significant update to the code base from 1.3.88. Please make sure you take a full-site backup with restore point before updating the plugin =
 
-= 2.0.22: August 10, 2018 =
+= 2.0.23: August 10, 2018 =
+
+* Bugfixes:
+  - Fixed File/Image uploader
+
+= 2.0.22: August 9, 2018 =
 
 * Enhancements:
   - Added an ability to filter user's profile slug "um_change_user_profile_slug"

ultimate-member.php

@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.0.22
+Version: 2.0.23
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member