diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-29 14:30:26 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-29 14:30:26 +0000 |
| commit | 4d6c9e3e1754d21ea5291207085113e99456f571 (patch) | |
| tree | 3a74789a0d5573863bc2e40ab6b364e589bb8697 /indra/llui/tests/llurlentry_test.cpp | |
| parent | ec5dbb60e71302a77f68cc604e7dfd52bcaa926a (diff) | |
EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:
<nolink>secondlife.com</nolink>
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 80be8fcbf7..6fec1d3e10 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -610,5 +610,13 @@ namespace tut testRegex("invalid .net URL", r, "foo.netty", ""); + + testRegex("XML tags around URL [1]", r, + "<foo>secondlife.com</foo>", + "secondlife.com"); + + testRegex("XML tags around URL [2]", r, + "<foo>secondlife.com/status?bar=1</foo>", + "secondlife.com/status?bar=1"); } } |