Merge remote-tracking branch 'remotes/origin/helpscout#24076' into release/2.0.26

2026-06-05 15:09:37 +09:00 · 2018-09-17 21:32:38 +03:00
parent e9c1f91885 f390e3203f
commit e5936b79b7
1 changed files with 6 additions and 0 deletions
@@ -1216,6 +1216,12 @@ if ( ! class_exists( 'um\core\User' ) ) {
 		 */
 		function approve() {
 			$user_id = um_user('ID');
+
+			$status = get_user_meta( $user_id, 'account_status', true );
+			if ( 'approved' === $status ) {
+				return;
+			}
+
 			delete_option( "um_cache_userdata_{$user_id}" );

 			if ( um_user('account_status') == 'awaiting_admin_review' ) {