From c5a93ca215a410069f41911b667de02e3b5c7881 Mon Sep 17 00:00:00 2001
From: Aigale <37140890+aigilea@users.noreply.github.com>
Date: Thu, 20 Jun 2019 03:48:35 +0300
Subject: [PATCH] Fix resolving placeholders in urls (#3281)

* Replace placeholders in URLs copied from popup menu on the entry preview widget.
* Replace placeholders in URLs opened by double-clicking URL field in the entry table.
---
 src/gui/DatabaseWidget.cpp     | 2 +-
 src/gui/EntryPreviewWidget.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 227e0dbd..d4688caa 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -696,7 +696,7 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
             }
         }
     } else {
-        QUrl url = QUrl::fromUserInput(entry->url());
+        QUrl url = QUrl::fromUserInput(entry->resolveMultiplePlaceholders(entry->url()));
         if (!url.isEmpty()) {
             QDesktopServices::openUrl(url);
         }
diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp
index c90d0aa6..42f164fb 100644
--- a/src/gui/EntryPreviewWidget.cpp
+++ b/src/gui/EntryPreviewWidget.cpp
@@ -202,7 +202,7 @@ void EntryPreviewWidget::updateEntryGeneralTab()
     const QString url = m_currentEntry->url();
     if (!url.isEmpty()) {
         // URL is well formed and can be opened in a browser
-        m_ui->entryUrlLabel->setUrl(url);
+        m_ui->entryUrlLabel->setUrl(m_currentEntry->resolveMultiplePlaceholders(url));
         m_ui->entryUrlLabel->setCursor(Qt::PointingHandCursor);
         m_ui->entryUrlLabel->setOpenExternalLinks(false);
     } else {