--- 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|'''([^']+?)'''|$1|g;
$line =~ s|''([^']+?)''|$1|g;
$line =~ s!
- (
- (<(mailto|http|https|ftp|urn):[\x21-\x7E]*)> # Direct http://...
- |
- ($WikiName) # LocalLinkLikeThis
- |
- ($BracketName) # [[日本語リンク]]
- )
+ (
+ (?:<(?:mailto|http|https|ftp|urn):[\x21-\x7E]*)>
+ | (?:$WikiName) # LocalLinkLikeThis
+ | (?:$BracketName) # [[日本語リンク]]
+ )
!
&make_link($1)
!gex;
@@ -670,6 +668,7 @@
# URLやページの名前からリンクを作る
sub make_link {
my $name = shift;
+ $name =~ s/^<(.*)>$/$1/;
if ($name =~ /^(http|https|ftp).*?(\.png|\.jpeg|\.jpg)?$/) {
if ($2) {
return qq|
|;