From: umorigu <umorigu@gmail.com>
Date: Sun, 1 Jun 2014 21:04:09 +0000 (+0900)
Subject: BugTrack2/343: Use ENT_COMPAT at htmlspecialchars
X-Git-Tag: r1_5_0_rc1~6
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=e607ffc613ca96889719a12bbc7b24548858909d

BugTrack2/343: Use ENT_COMPAT at htmlspecialchars

Use ENT_COMPAT for 2nd- $flags parameter at 'htmlspecialchars' instead of
ENT_QUOTES because of the compatibility of PukiWiki 1.4.7
---

diff --git a/lib/func.php b/lib/func.php
index 43db3dd..cc9c0f3 100644
--- a/lib/func.php
+++ b/lib/func.php
@@ -702,7 +702,7 @@ function csv_implode($glue, $pieces)
 }
 
 // Sugar with default settings
-function htmlsc($string = '', $flags = ENT_QUOTES, $charset = CONTENT_CHARSET)
+function htmlsc($string = '', $flags = ENT_COMPAT, $charset = CONTENT_CHARSET)
 {
 	return htmlspecialchars($string, $flags, $charset);	// htmlsc()
 }