livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify fix for FIRE-16642

meow-7.2.2
Ansariel 2015-08-13 20:59:06 +02:00
parent 3273e637f9
commit 805c83bc7a
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcommon/lluriparser.h
View File

@ -65,6 +65,9 @@ public:
bool test() const;
S32 normalize();
// <FS:Ansariel> Getter for mRes
S32 getLastRes() const { return mRes; }
private:
S32 parse();
void textRangeToString(UriTextRangeA& textRange, std::string& str);

26
indra/llui/llurlentry.cpp
View File

@ -195,6 +195,10 @@ std::string LLUrlEntryBase::urlToLabelWithGreyQuery(const std::string &url) cons
// <FS:Ansariel> Unfail URI display
//LLUriParser up(unescapeUrl(url));
LLUriParser up(url);
if (up.getLastRes())
{
return unescapeUrl(url);
}
// </FS:Ansariel>
up.normalize();
@ -255,16 +259,7 @@ LLUrlEntryHTTP::LLUrlEntryHTTP()
std::string LLUrlEntryHTTP::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
{
// <FS:Ansariel> FIRE-16642: Show invalid Hypergrid node URIs
//return urlToLabelWithGreyQuery(url);
LLUriParser up(url);
if (!up.normalize())
{
return urlToLabelWithGreyQuery(url);
}
return url;
// </FS:Ansariel>
return urlToLabelWithGreyQuery(url);
}
std::string LLUrlEntryHTTP::getQuery(const std::string &url) const
@ -341,16 +336,7 @@ LLUrlEntryHTTPNoProtocol::LLUrlEntryHTTPNoProtocol()
std::string LLUrlEntryHTTPNoProtocol::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
{
// <FS:Ansariel> FIRE-16642: Show invalid Hypergrid node URIs
//return urlToLabelWithGreyQuery(url);
LLUriParser up(url);
if (!up.normalize())
{
return urlToLabelWithGreyQuery(url);
}
return url;
// </FS:Ansariel>
return urlToLabelWithGreyQuery(url);
}
std::string LLUrlEntryHTTPNoProtocol::getQuery(const std::string &url) const