Skip to content
Snippets Groups Projects
Commit f695f8d1 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web...

STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.

Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
parent 4ab5831b
No related branches found
No related tags found
No related merge requests found
......@@ -1134,7 +1134,7 @@ std::string LLUrlEntryWorldMap::getLocation(const std::string &url) const
//
LLUrlEntryNoLink::LLUrlEntryNoLink()
{
mPattern = boost::regex("<nolink>.*</nolink>",
mPattern = boost::regex("<nolink>[^<]*</nolink>",
boost::regex::perl|boost::regex::icase);
}
......
......@@ -6834,7 +6834,7 @@ Are you sure you want to share the following items:
With the following Residents:
[RESIDENTS]
&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment