godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49291 from NoFr1ends/fix-49262

Browse Source 
String::format leave passed values untouched
This commit is contained in:
Rémi Verschelde 2021-07-13 09:33:46 +02:00 committed by GitHub
commit e2b79e9591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/string/ustring.cpp
View File

@ -3397,17 +3397,10 @@ String String::format(const Variant &values, String placeholder) const {
if (value_arr.size() == 2) { if (value_arr.size() == 2) {
Variant v_key = value_arr[0]; Variant v_key = value_arr[0];
String key = v_key; String key = v_key;
if (key.left(1) == "\"" && key.right(1) == "\"") {
key = key.substr(1, key.length() - 2);
}
Variant v_val = value_arr[1]; Variant v_val = value_arr[1];
String val = v_val; String val = v_val;
if (val.left(1) == "\"" && val.right(1) == "\"") {
val = val.substr(1, val.length() - 2);
}
new_string = new_string.replace(placeholder.replace("_", key), val); new_string = new_string.replace(placeholder.replace("_", key), val);
} else { } else {
ERR_PRINT(String("STRING.format Inner Array size != 2 ").ascii().get_data()); ERR_PRINT(String("STRING.format Inner Array size != 2 ").ascii().get_data());
@ -3416,10 +3409,6 @@ String String::format(const Variant &values, String placeholder) const {
Variant v_val = values_arr[i]; Variant v_val = values_arr[i];
String val = v_val; String val = v_val;
if (val.left(1) == "\"" && val.right(1) == "\"") {
val = val.substr(1, val.length() - 2);
}
if (placeholder.find("_") > -1) { if (placeholder.find("_") > -1) {
new_string = new_string.replace(placeholder.replace("_", i_as_str), val); new_string = new_string.replace(placeholder.replace("_", i_as_str), val);
} else { } else {
@ -3436,14 +3425,6 @@ String String::format(const Variant &values, String placeholder) const {
String key = E->get(); String key = E->get();
String val = d[E->get()]; String val = d[E->get()];
if (key.left(1) == "\"" && key.right(1) == "\"") {
key = key.substr(1, key.length() - 2);
}
if (val.left(1) == "\"" && val.right(1) == "\"") {
val = val.substr(1, val.length() - 2);
}
new_string = new_string.replace(placeholder.replace("_", key), val); new_string = new_string.replace(placeholder.replace("_", key), val);
} }
} else { } else {