diff --git a/app/main/views/send.py b/app/main/views/send.py index 7899af5a8..1b723cb22 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -1009,9 +1009,17 @@ def _send_notification(service_id, template_id): keys = [] values = [] + # Guarantee that the real phone number comes last, because some + # users will have placeholders like "add your second phone number" + # or something like as custom placeholders. for k, v in session["placeholders"].items(): - keys.append(k) - values.append(v) + if k != "phone number": + keys.append(k) + values.append(v) + for k, v in session["placeholders"].items(): + if k == "phone number": + keys.append(k) + values.append(v) data = ",".join(keys) vals = ",".join(values)