PyukiWiki CVS Commit
pyuki****@lists*****
2012年 3月 20日 (火) 19:47:19 JST
Index: PyukiWiki-Devel-UTF8/lib/wiki.cgi
diff -u PyukiWiki-Devel-UTF8/lib/wiki.cgi:1.391 PyukiWiki-Devel-UTF8/lib/wiki.cgi:1.392
--- PyukiWiki-Devel-UTF8/lib/wiki.cgi:1.391 Tue Mar 20 19:30:34 2012
+++ PyukiWiki-Devel-UTF8/lib/wiki.cgi Tue Mar 20 19:47:19 2012
@@ -1,6 +1,6 @@
######################################################################
# wiki.cgi - This is PyukiWiki, yet another Wiki clone.
-# $Id: wiki.cgi,v 1.391 2012/03/20 10:30:34 papu Exp $
+# $Id: wiki.cgi,v 1.392 2012/03/20 10:47:19 papu Exp $
#
# "PyukiWiki" ver 0.2.0-p3-dev2 $$
# Copyright (C) 2004-2012 Nekyo
@@ -173,7 +173,7 @@
$::embedded_name = '(\#.+?)';
# インライン型プラグイン # comment
-$::embedded_inline='&(?:([^(;{]+)(?:[()\s?]*?)\s?\{\s?([^&}]*?)\s?\}|([^(;{]+)|([^(;{]+)\s?\(\s?([^)]*?)\s?\)|([^(;{]+)\s?\(\s?([^)]*?)\s?\)\s?\{\s?([^&}]*?)\s?\});';
+$::embedded_inline='&(?:([^(;{]+)(?:[()\s?]*?)\s?\{\s?([^&}]*?)\s?\}|([^(;{]+)|([^(;{]+)\s?\(\s?([^)]*?)\s?\)|([^(;{]+)\s?\(\s?([^)]*?)\s?\)\s?\{\s?([^&}]*?)\s?\});';
############################## # comment
# InfoBasã®é …ç›®å # comment
@@ -2817,7 +2817,7 @@
$line =~ s|^//.*||g; # Comment # comment
# Comment # debug # comment
$line =~ s|\s//\s\#.*$||g;
-# $line = &htmlspecialchars($line);
+ $line = &htmlspecialchars($line);
# $line=~s!$::_inline!<$::_inline{$1}>$2</$::_inline{$1}>!go; # comment
@@ -2875,8 +2875,6 @@
$line =~ s|\[\#(.*)\]|<a class="anchor_super" id="$1" href="#$1" title="$1">$::_symbol_anchor</a>|g;
- $line = &htmlspecialchars($line);
-
# é¡”æ–‡å— # comment
if ($::usefacemark == 1) {
$line=~s!($::_facemark)!<img src="$::image_url/face/$::_facemark{$1}" alt="@{[htmlspecialchars($1,1)]}" />!go;
@@ -5468,19 +5466,15 @@
sub htmlspecialchars {
my($s,$flg)=@_;
-# return $s if($s!~/([<>"&])/);
+ return $s if($s!~/([<>"&])/);
- $s=~s/&(\w{1,16});/\r$1;/g;
$s=~s/([<>"&])/$::_htmlspecial{$1}/g;
- $s=~s/\r(\w{1,16});/&$1;/g;
+ return $s if($flg eq 1);
+ # 顔文å—ã€SGML実体å‚照を戻㙠# comment
+ $s=~s/&($::_sgmlescape);/&$1;/ig;
+ # 10進ã€16進実態å‚照を戻㙠# comment
+ $s=~s/&#([0-9A-Fa-fXx]+)?;/&#$1;/g;
return $s;
-
-# return $s if($flg eq 1); # comment
-# # 顔文å—ã€SGML実体å‚照を戻㙠# comment # comment
-# $s=~s/&($::_sgmlescape);/&$1;/ig; # comment
-# # 10進ã€16進実態å‚照を戻㙠# comment # comment
-# $s=~s/&#([0-9A-Fa-fXx]+)?;/&#$1;/g; # comment
-# return $s; # comment
}
=lang ja