OSDN Git Service

BugTrack-wiki/343
authortakezoe <takezoe@users.osdn.me>
Tue, 23 Aug 2011 03:03:51 +0000 (03:03 +0000)
committertakezoe <takezoe@users.osdn.me>
Tue, 23 Aug 2011 03:03:51 +0000 (03:03 +0000)
文字コードの指定のないInterWikiNameもEUCでURLエンコードするようにした。

lib/Wiki/InterWiki.pm

index 0e90ec0..adbd24b 100644 (file)
@@ -103,7 +103,7 @@ sub _parse_line {
            || $source =~ /\[([^\[]+?)\|((\/|\.\/|\.\.\/)+[a-zA-Z0-9\.,%~^_+\-%\/\?\(\)!\$&=:;\*#\@']*)\]/) {
                my $label = $1;
                my $url   = $2;
-               my $enc   = "";
+               my $enc   = "euc";
                $self->add_inter_wiki($url,$label,$enc);
        }
        # Ç¤°Õ¤ÎURL¥ê¥ó¥¯
@@ -117,7 +117,7 @@ sub _parse_line {
        elsif ($source =~ /\[([^\[]+?)\|(.+?)\]/) {
                my $label = $1;
                my $url   = $2;
-               my $enc   = "";
+               my $enc   = "euc";
                $self->add_inter_wiki($url,$label,$enc);
 
        }
@@ -159,9 +159,7 @@ sub exists_interwiki {
                        my $enc   = $keyword->{enc};
                        my $param = $1;
                        $self->{g_label} = $keyword->{label}.':'.$param;
-                       if ($enc ne q{}) {
-                               &Jcode::convert(\$param, $enc);
-                       }
+                       &Jcode::convert(\$param, $enc);
                        $self->{g_url} = $keyword->{url}._url_encode($param);
                        return 1;
                }
@@ -172,9 +170,7 @@ sub exists_interwiki {
                        $self->{g_label} = $1;
                        my $enc   = $keyword->{enc};
                        my $param = $2;
-                       if ($enc ne q{}) {
-                               &Jcode::convert(\$param, $enc);
-                       }
+                       &Jcode::convert(\$param, $enc);
                        $self->{g_url} = $keyword->{url}._url_encode($param);
                        return 1;
                }