From: takezoe <takezoe@users.osdn.me>
Date: Tue, 23 Aug 2011 03:03:51 +0000 (+0000)
Subject: BugTrack-wiki/343
X-Git-Url: http://git.osdn.net/view?p=fswiki%2Ffswiki.git;a=commitdiff_plain;h=bc2b465b6edde9bdc8906aa7fa9e6ea485c9f6ee

BugTrack-wiki/343
文字コードの指定のないInterWikiNameもEUCでURLエンコードするようにした。
---

diff --git a/lib/Wiki/InterWiki.pm b/lib/Wiki/InterWiki.pm
index 0e90ec0..adbd24b 100644
--- a/lib/Wiki/InterWiki.pm
+++ b/lib/Wiki/InterWiki.pm
@@ -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;
 		}