Ignore:
Timestamp:
2017-04-07T00:18:07+02:00 (7 years ago)
Author:
Don-vip
Message:

fix #14613 - Special HTML characters not escaped in GUI error messages

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r11709 r11848  
    2929import org.openstreetmap.josm.tools.ImageProvider;
    3030import org.openstreetmap.josm.tools.Shortcut;
     31import org.openstreetmap.josm.tools.Utils;
    3132
    3233/**
    … …  
    154155                Main.parent,
    155156                tr("<html>The data to be uploaded participates in unresolved conflicts of layer ''{0}''.<br>"
    156                         + "You have to resolve them first.</html>", layer.getName()
     157                        + "You have to resolve them first.</html>", Utils.escapeReservedCharactersHTML(layer.getName())
    157158                ),
    158159                tr("Warning"),
    … …  
    173174                    "Sending data from this layer is <b>strongly discouraged</b>. If you continue,<br />"+
    174175                    "it may require you subsequently have to revert your changes, or force other contributors to.<br /><br />"+
    175                     "Are you sure you want to continue?", layer.getName())+
     176                    "Are you sure you want to continue?", Utils.escapeReservedCharactersHTML(layer.getName()))+
    176177                "</html>",
    177178                ImageProvider.get("upload"), tr("Ignore this hint and upload anyway"));
Note: See TracChangeset for help on using the changeset viewer.