From e971d1e6b31133ae2adec166da5597ae5bba85aa Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 25 Sep 2023 21:08:35 +0300
Subject: [PATCH] - updated dependencies versions; - fixed permalinks generate
 function for getting raw base permalink from the user meta;

---
 includes/admin/core/class-admin-settings.php |  1 -
 includes/class-dependencies.php              |  4 ++--
 includes/class-init.php                      |  6 ++++--
 includes/core/class-user.php                 | 15 ++++++++-------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index 65e0bc92..0928738a 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -2458,7 +2458,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 						}
 					}
 
-
 					// update for um_member_directory_data metakey
 					if ( isset( $_POST['um_options']['use_gravatars'] ) ) {
 						if ( $this->gravatar_changed ) {
diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php
index 4fbc8f61..90a5f789 100644
--- a/includes/class-dependencies.php
+++ b/includes/class-dependencies.php
@@ -32,10 +32,10 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 		public $ext_required_version = array(
 			'bbpress'              => '2.0.7',
 			'followers'            => '2.1.6',
-			'forumwp'              => '2.0.4',
+			'forumwp'              => '2.1.5',
 			'friends'              => '2.1.4',
 			'groups'               => '2.1.7',
-			'jobboardwp'           => '1.0.0',
+			'jobboardwp'           => '1.0.7',
 			'mailchimp'            => '2.2.0',
 			'messaging'            => '2.2.5',
 			'mycred'               => '2.1.6',
diff --git a/includes/class-init.php b/includes/class-init.php
index 7d3f2d79..23dec48b 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -1,5 +1,7 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
-
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'UM' ) ) {
 
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index f0dd02cc..737dabdd 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -699,11 +699,12 @@ if ( ! class_exists( 'um\core\User' ) ) {
 
 
 		/**
-		 * @param $user_id
+		 * @param int  $user_id
+		 * @param bool $raw
 		 *
 		 * @return bool|mixed
 		 */
-		public function get_profile_slug( $user_id ) {
+		public function get_profile_slug( $user_id, $raw = false ) {
 			// Permalink base
 			$permalink_base = UM()->options()->get( 'permalink_base' );
 			if ( 'custom_meta' === $permalink_base ) {
@@ -720,6 +721,10 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			}
 			$profile_slug = get_user_meta( $user_id, $meta_key, true );
 
+			if ( $raw ) {
+				return $profile_slug;
+			}
+
 			//get default username permalink if it's empty then return false
 			if ( empty( $profile_slug ) ) {
 				if ( 'user_login' !== $permalink_base ) {
@@ -779,7 +784,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 
 			delete_option( "um_cache_userdata_{$user_id}" );
 
-			$current_profile_slug = $this->get_profile_slug( $user_id );
+			$current_profile_slug = $this->get_profile_slug( $user_id, true );
 
 			$user_in_url    = '';
 			$permalink_base = UM()->options()->get( 'permalink_base' );
@@ -847,9 +852,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 					update_user_meta( $user_id, "um_email_as_username_{$user_in_url}", $user_email );
 
 				} else {
-
 					$user_in_url = urlencode( $user_in_url );
-
 				}
 			}
 
@@ -897,9 +900,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 						update_user_meta( $user_id, "um_email_as_username_{$user_in_url}", $user_email );
 
 					} else {
-
 						$user_in_url = sanitize_title( $user_in_url );
-
 					}
 				}