in unescape add normal characters in addition to unescaped characters :)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index c251d923265697788739521161875109479b74b2..584eaf37e1c9bdf581ce6219498268010dee548e 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -117,7 +117,8 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
 {
     wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
 
 {
     wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
 

-    return (wxChar)( CharToHex(*s) * 0x10 ) | CharToHex(*++s);
+    //<<4 == 16
+    return ( CharToHex(*s) << 4 ) | CharToHex(*++s);

 }
 
 wxString wxURI::Unescape(const wxString& uri)
 }
 
 wxString wxURI::Unescape(const wxString& uri)


@@ -131,6 +132,8 @@ wxString wxURI::Unescape(const wxString& uri)
             new_uri += wxURI::TranslateEscape( &(uri.c_str()[i+1]) );
             i += 2;
         }
             new_uri += wxURI::TranslateEscape( &(uri.c_str()[i+1]) );
             i += 2;
         }

+        else
+            new_uri += uri[i];

     }
 
     return new_uri;
     }
 
     return new_uri;