mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
5a2dc969cb
1 changed files with 4 additions and 2 deletions
|
@ -78,7 +78,7 @@ namespace NLGUI
|
||||||
pos = uri.find("?");
|
pos = uri.find("?");
|
||||||
if (pos != npos)
|
if (pos != npos)
|
||||||
{
|
{
|
||||||
query = uri.substr(pos + 1);
|
query = uri.substr(pos);
|
||||||
uri = uri.substr(0, pos);
|
uri = uri.substr(0, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -210,7 +210,9 @@ namespace NLGUI
|
||||||
result += path;
|
result += path;
|
||||||
|
|
||||||
if (!query.empty())
|
if (!query.empty())
|
||||||
result += "?" + query;
|
if (query.find_first_of("?") != 0)
|
||||||
|
result += "?";
|
||||||
|
result += query;
|
||||||
|
|
||||||
if (!hash.empty())
|
if (!hash.empty())
|
||||||
result += "#" + hash;
|
result += "#" + hash;
|
||||||
|
|
Loading…
Reference in a new issue