From 3b5ee6a38a09dedf7e3e931d5c57e77366f97242 Mon Sep 17 00:00:00 2001 From: Jonas Bernemann Date: Thu, 3 Jun 2021 23:07:38 +0200 Subject: [PATCH] String::format leave passed values untouched If the passed value or key contains double quotation marks it will no longer get removed. (cherry picked from commit a403efb67c5a0e39911b9bdb3669d5d45b049c7e) --- core/ustring.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/core/ustring.cpp b/core/ustring.cpp index cb13519d2ca..ee5617728d2 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -2959,17 +2959,10 @@ String String::format(const Variant &values, String placeholder) const { if (value_arr.size() == 2) { Variant v_key = value_arr[0]; String key = v_key; - if (key.left(1) == "\"" && key.right(key.length() - 1) == "\"") { - key = key.substr(1, key.length() - 2); - } Variant v_val = value_arr[1]; String val = v_val; - if (val.left(1) == "\"" && val.right(val.length() - 1) == "\"") { - val = val.substr(1, val.length() - 2); - } - new_string = new_string.replace(placeholder.replace("_", key), val); } else { ERR_PRINT(String("STRING.format Inner Array size != 2 ").ascii().get_data()); @@ -2978,10 +2971,6 @@ String String::format(const Variant &values, String placeholder) const { Variant v_val = values_arr[i]; String val = v_val; - if (val.left(1) == "\"" && val.right(val.length() - 1) == "\"") { - val = val.substr(1, val.length() - 2); - } - if (placeholder.find("_") > -1) { new_string = new_string.replace(placeholder.replace("_", i_as_str), val); } else { @@ -2998,14 +2987,6 @@ String String::format(const Variant &values, String placeholder) const { String key = E->get(); String val = d[E->get()]; - if (key.left(1) == "\"" && key.right(key.length() - 1) == "\"") { - key = key.substr(1, key.length() - 2); - } - - if (val.left(1) == "\"" && val.right(val.length() - 1) == "\"") { - val = val.substr(1, val.length() - 2); - } - new_string = new_string.replace(placeholder.replace("_", key), val); } } else {