--- suikawiki/script/wiki.cgi	2002/02/04 15:23:58	1.6
+++ suikawiki/script/wiki.cgi	2002/02/04 15:27:22	1.7
@@ -20,7 +20,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# $Id: wiki.cgi,v 1.6 2002/02/04 15:23:58 wakaba Exp $
+# $Id: wiki.cgi,v 1.7 2002/02/04 15:27:22 wakaba Exp $
 ##############################
 my $version = "1.6.6";
 ##############################
@@ -564,13 +564,11 @@
     $line =~ s|'''([^']+?)'''|<strong>$1</strong>|g;
     $line =~ s|''([^']+?)''|<em>$1</em>|g;          
     $line =~ s!
-                (
-                    (&lt;(mailto|http|https|ftp|urn):[\x21-\x7E]*)&gt; # Direct http://...
-                        |
-                    ($WikiName)                         # LocalLinkLikeThis
-                        |
-                    ($BracketName)                      # [[日本語リンク]]
-                )
+       (
+         (?:&lt;(?:mailto|http|https|ftp|urn):[\x21-\x7E]*)&gt;
+       | (?:$WikiName)                         # LocalLinkLikeThis
+       | (?:$BracketName)                      # [[日本語リンク]]
+       )
             !
                 &make_link($1)
             !gex;
@@ -670,6 +668,7 @@
 # URLやページの名前からリンクを作る
 sub make_link {
     my $name = shift;
+    $name =~ s/^&lt;(.*)&gt;$/$1/;
     if ($name =~ /^(http|https|ftp).*?(\.png|\.jpeg|\.jpg)?$/) {
         if ($2) {
             return qq|<a href="$name"><img border="0" src="$name" /></a>|;