From 18628612b243a2f699a18291735b03e356b12375 Mon Sep 17 00:00:00 2001
From: Benoit Mortgat <mortgat@gmail.com>
Date: Mon, 5 Mar 2018 17:02:02 +0100
Subject: [PATCH] Allow references in part of a field

When a field value is of the form ...{REF:...}...
Then:

* Auto-type does not work with that field
* References to this field are not properly resolved

This commit fixes both issues.
---
 src/core/Entry.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index fa45ca5e4..1aa79c634 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -801,27 +801,27 @@ QString Entry::resolvePlaceholderRecursive(const QString& placeholder, int maxDe
         if (placeholderType(title()) == PlaceholderType::Title) {
             return title();
         }
-        return resolvePlaceholderRecursive(title(), maxDepth - 1);
+        return resolveMultiplePlaceholdersRecursive(title(), maxDepth - 1);
     case PlaceholderType::UserName:
         if (placeholderType(username()) == PlaceholderType::UserName) {
             return username();
         }
-        return resolvePlaceholderRecursive(username(), maxDepth - 1);
+        return resolveMultiplePlaceholdersRecursive(username(), maxDepth - 1);
     case PlaceholderType::Password:
         if (placeholderType(password()) == PlaceholderType::Password) {
             return password();
         }
-        return resolvePlaceholderRecursive(password(), maxDepth - 1);
+        return resolveMultiplePlaceholdersRecursive(password(), maxDepth - 1);
     case PlaceholderType::Notes:
         if (placeholderType(notes()) == PlaceholderType::Notes) {
             return notes();
         }
-        return resolvePlaceholderRecursive(notes(), maxDepth - 1);
+        return resolveMultiplePlaceholdersRecursive(notes(), maxDepth - 1);
     case PlaceholderType::Url:
         if (placeholderType(url()) == PlaceholderType::Url) {
             return url();
         }
-        return resolvePlaceholderRecursive(url(), maxDepth - 1);
+        return resolveMultiplePlaceholdersRecursive(url(), maxDepth - 1);
     case PlaceholderType::UrlWithoutScheme:
     case PlaceholderType::UrlScheme:
     case PlaceholderType::UrlHost: