・デコードは URL デコードなのに、エンコードが間違っていたので URL エンコードするように修正。

diff --git a/Favorite.pas b/Favorite.pas
index 413078e..2b4e015 100644 (file)
--- a/Favorite.pas
+++ b/Favorite.pas
@@ -352,21 +352,21 @@ begin
        for i := 0 to Node.Count - 1 do begin
                if TObject(Node.Item[i].Data) is TFavoriteFolder then begin
        if Node.Item[ i ].Expanded then
-                               s := Format('<folder title="%s" expanded="true">', [HtmlEncode(Node.Item[i].Text)])
+                               s := Format('<folder title="%s" expanded="true">', [HttpEncode(Node.Item[i].Text)])
       else
-                               s := Format('<folder title="%s" expanded="false">', [HtmlEncode(Node.Item[i].Text)]);
+                               s := Format('<folder title="%s" expanded="false">', [HttpEncode(Node.Item[i].Text)]);
                        SaveList.Add(s);
                        AddSaveString(Node.Item[i], SaveList);
                        SaveList.Add('</folder>');
                end else if TObject(Node.Item[i].Data) is TFavoriteBoardItem then begin
                        FavBoard := TFavoriteBoardItem(Node.Item[i].Data);
                        s := Format('<favitem type="2ch" favtype="board" url="%s" title="%s"/>',
-                                                                       [HtmlEncode( FavBoard.Item.URL ), HtmlEncode(FavBoard.Title)]);
+                                                                       [HttpEncode( FavBoard.Item.URL ), HttpEncode(FavBoard.Title)]);
                        SaveList.Add(s);
                end else if TObject(Node.Item[i].Data) is TFavoriteThreadItem then begin
                        FavThread := TFavoriteThreadItem(Node.Item[i].Data);
                        s := Format('<favitem type="2ch" favtype="thread" url="%s" title="%s"/>',
-                                                                       [HtmlEncode( FavThread.Item.URL ), HtmlEncode(FavThread.Title)]);
+                                                                       [HttpEncode( FavThread.Item.URL ), HttpEncode(FavThread.Title)]);
                        SaveList.Add(s);
                end;
        end;

diff --git a/GikoXMLDoc.pas b/GikoXMLDoc.pas
index ae3e00e..99cba6c 100644 (file)
--- a/GikoXMLDoc.pas
+++ b/GikoXMLDoc.pas
@@ -394,7 +394,7 @@ begin
                                                f.Seek( last, soFromBeginning );
                                                f.ReadBuffer( PChar( attributeValue )^, tagLen );
 
-                                               node.AddAttribute( attributeName, HtmlDecode( attributeValue ) );
+                                               node.AddAttribute( attributeName, HttpDecode( attributeValue ) );
 
                                                // \92l\82ð\93Ç\82Ý\8fI\82í\82Á\82½\82Ì\82Å\8fI\97¹
                                                f.Seek( f.Position + 1, soFromBeginning ); // '"' \94ò\82Î\82µ
@@ -402,7 +402,7 @@ begin
                                        end else if ch in kXMLWhite then
                                        begin
                                                // \8bK\8ai\8aO\82¾\82¯\82Ç\82Ë
-                                               node.AddAttribute( attributeName, HtmlDecode( attributeValue ) );
+                                               node.AddAttribute( attributeName, HttpDecode( attributeValue ) );
 
                                                goto NextNode;
                                        end else begin