fix regex for placeholders, fix #402, add regression test

2017-03-16 20:31:14 +01:00
parent 4cccf28b4d
commit e3602e3c75
5 changed files with 59 additions and 13 deletions
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -649,7 +649,8 @@ const Database* Entry::database() const
 QString Entry::resolveMultiplePlaceholders(const QString& str) const
 {
    QString result = str;
-    QRegExp tmplRegEx("({.*})", Qt::CaseInsensitive, QRegExp::RegExp2);
+    QRegExp tmplRegEx("(\\{.*\\})", Qt::CaseInsensitive, QRegExp::RegExp2);
+    tmplRegEx.setMinimal(true);
    QStringList tmplList;
    int pos = 0;