View difference between Paste ID: ZCAx62Ne and dUVTwCuE

 /**
  * 1. Toolset API
  */
-	// Do not change native permalinks or differnt post types
+function pm_toolset_related_posts_fields($custom_field_value, $custom_field, $post) {
-	if($native_uri) { return $default_uri; }
+	// The permastructure tag should be formated like this
 	// %__{relationship_slug}%, eg. %__posts_pages%
-	// List of relationship fields that should be replaced
+
-	$relationship_fields = array(
+	// Do not change native permalinks
-		'custom-post-1', // Use %__custom-post-1% tag in Permastructure settings
+	if($native_uri || empty($post->ID) || !function_exists('toolset_get_relationship')) { return $custom_field_value; }
-		'custom-post-2', // Use %__custom-post-2% tag in Permastructure settings
+
-	);
+	$relationship = toolset_get_relationship($custom_field);
 
-	foreach($relationship_fields as $field) {
+	if(!empty($relationship)) {
-		if(strpos($default_uri, "%__{$field}%") === false) { continue; }
+		$related_post_id = toolset_get_related_post($post->ID, $custom_field);
 
-		$relationship = $wpdb->get_row($wpdb->prepare("SELECT parent_id, child_id FROM {$wpdb->prefix}toolset_relationships as r LEFT JOIN {$wpdb->prefix}toolset_associations AS a ON r.id = a.relationship_id  WHERE slug = %s", $field));
+		if(!empty($related_post_id)) {
 			$related_post = get_post($related_post_id);
-		if(!empty($relationship->parent_id)) {
+
-			$related_post_id = ($post->ID !== $relationship->parent_id) ? $relationship->parent_id : $relationship->child_id;
+			if(!empty($related_post->post_name)) {
 				$custom_field_value = Permalink_Manager_Helper_Functions::force_custom_slugs($related_post->post_name, $related_post);
 			}
-			$default_uri = str_replace("%__{$field}%", $related_post->post_name, $default_uri);
+
 	}
 
 	return $custom_field_value;
 }
 add_filter('permalink_manager_custom_field_value', 'pm_toolset_related_posts_fields', 1, 5);
-add_filter('permalink_manager_filter_default_post_uri', 'pm_toolset_related_posts_fields', 10, 5);
+
 /**
  * 2. Legacy variant
  */
 function pm_toolset_related_posts_fields($default_uri, $native_slug, $post, $slug, $native_uri) {
 	global $wpdb;
 
 	// The permastructure tag should be formated like this
 	// %__{relationship_slug}%, eg. %__posts_pages%
 
 	// Do not change native permalinks
 	if($native_uri || empty($post->ID) || !function_exists('toolset_get_relationship')) { return $default_uri; }
 
 	// Use it only when custom fields tags are present in the permastructure settings
 	if(strpos($default_uri, "%__") === false) { return $default_uri; }
 
 	// Use it only for specific post types
 	// if(empty($post->post_type) && !in_array($post->post_type, array('cpt1', 'cpt2'))) { return $default_uri; }
 
 	// List of available relationship fields that should be replaced
 	$relationship_fields = $wpdb->get_col("SELECT slug FROM {$wpdb->prefix}toolset_relationships");
 
 	if(!empty($relationship_fields)) {
 		foreach($relationship_fields as $field) {
 			if(strpos($default_uri, "%__{$field}%") === false) { continue; }
 
 			$related_post_id = toolset_get_related_post($post, $field);
 
 			if(!empty($related_post_id) && is_numeric($related_post_id)) {
 				$related_post_uri = get_page_uri($related_post_id);
 
 				$default_uri = str_replace("%__{$field}%", $related_post_uri, $default_uri);
 			}
 		}
 	}
 	return $default_uri;
 }
 add_filter('permalink_manager_filter_default_post_uri', 'pm_toolset_related_posts_fields', 5, 5);