提交: 4cafe30fc4dac548fd3a33ef89eab3524a8181a6 - pukiwiki_original (git)

Commit MetaInfo

• 修訂: 4cafe30fc4dac548fd3a33ef89eab3524a8181a6 (tree)
• 時間: 2011-02-02 00:01:18
• 作者: henoheno <henoheno>
• Commiter: henoheno

Log Message

BugTrack2/343: htmlsc()'s default setting ENT_QUOTES suppresses replacing single quotes (notified by masao)

Change Summary

• modified: default.ini.php
• modified: keitai.ini.php

差異

--- a/default.ini.php
+++ b/default.ini.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: default.ini.php,v 1.25 2005-12-20 14:04:40 henoheno Exp $
+// $Id: default.ini.php,v 1.26 2011-02-01 15:01:18 henoheno Exp $
 // Copyright (C)
 //   2003-2005 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -115,8 +115,8 @@ $line_rules = array(
 	'SIZE\(([^\(\)]*)\):((?:(?!SIZE\([^\)]+\)\:).)*)'	=> '<span class="size$1">$2</span>',
 	'%%%(?!%)((?:(?!%%%).)*)%%%'	=> '<ins>$1</ins>',
 	'%%(?!%)((?:(?!%%).)*)%%'	=> '<del>$1</del>',
-	"'''(?!')((?:(?!''').)*)'''"	=> '<em>$1</em>',
-	"''(?!')((?:(?!'').)*)''"	=> '<strong>$1</strong>',
+	"&#039;&#039;&#039;(?!&#039;)((?:(?!&#039;&#039;&#039;).)*)&#039;&#039;&#039;" => '<em>$1</em>',
+	"&#039;&#039;(?!&#039;)((?:(?!&#039;&#039;).)*)&#039;&#039;" => '<strong>$1</strong>',
 );
 
 /////////////////////////////////////////////////

--- a/keitai.ini.php
+++ b/keitai.ini.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: keitai.ini.php,v 1.25 2005-12-10 07:57:30 henoheno Exp $
+// $Id: keitai.ini.php,v 1.26 2011-02-01 15:01:18 henoheno Exp $
 // Copyright (C)
 //   2002-2005 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -188,8 +188,8 @@ $line_rules = array(
 	'SIZE\(([^\(\)]*)\):((?:(?!SIZE\([^\)]+\)\:).)*)'	=> '$2', // Disabled
 	'%%%(?!%)((?:(?!%%%).)*)%%%'	=> '<ins>$1</ins>',
 	'%%(?!%)((?:(?!%%).)*)%%'	=> '<del>$1</del>',
-	"'''(?!')((?:(?!''').)*)'''"	=> '<em>$1</em>',
-	"''(?!')((?:(?!'').)*)''"	=> '<strong>$1</strong>',
+	"&#039;&#039;&#039;(?!&#039;)((?:(?!&#039;&#039;&#039;).)*)&#039;&#039;&#039;" => '<em>$1</em>',
+	"&#039;&#039;(?!&#039;)((?:(?!&#039;&#039;).)*)&#039;&#039;" => '<strong>$1</strong>',
 );