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()
 }
diff --git a/plugin/ls2.inc.php b/plugin/ls2.inc.php
index 8495e8a..a26f257 100644
--- a/plugin/ls2.inc.php
+++ b/plugin/ls2.inc.php
@@ -38,7 +38,8 @@ function plugin_ls2_action()
 	global $vars, $_ls2_msg_title;
 
 	$params = array();
-	foreach (array('title', 'include', 'reverse') as $key)
+	$keys   = array('title', 'include', 'reverse');
+	foreach ($keys as $key)
 		$params[$key] = isset($vars[$key]);
 
 	$prefix = isset($vars['prefix']) ? $vars['prefix'] : '';
@@ -70,7 +71,8 @@ function plugin_ls2_convert()
 	}
 	if ($prefix == '') $prefix = strip_bracket($vars['page']) . '/';
 
-	array_walk($args, 'plugin_ls2_check_arg', & $params);
+	foreach ($args as $arg)
+		plugin_ls2_check_arg($arg, $params);
 
 	$title = (! empty($params['_args'])) ? join(',', $params['_args']) :   // Manual
 		str_replace('$1', htmlsc($prefix), $_ls2_msg_title); // Auto
@@ -103,7 +105,7 @@ function plugin_ls2_show_lists($prefix, & $params)
 	natcasesort($pages);
 	if ($params['reverse']) $pages = array_reverse($pages);
 
-	foreach ($pages as $page) $params["page_$page"] = 0;
+	foreach ($pages as $page) $params['page_ ' . $page] = 0;
 
 	if (empty($pages)) {
 		return str_replace('$1', htmlsc($prefix), $_ls2_err_nopages);
@@ -200,7 +202,7 @@ function plugin_ls2_list_push(& $params, $level)
 }
 
 // オプションを解析する
-function plugin_ls2_check_arg($value, $key, & $params)
+function plugin_ls2_check_arg($value, & $params)
 {
 	if ($value == '') {
 		$params['_done'] = TRUE;
diff --git a/plugin/online.inc.php b/plugin/online.inc.php
index c446a2e..9dd9b54 100644
--- a/plugin/online.inc.php
+++ b/plugin/online.inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: online.inc.php,v 1.9 2005/06/25 10:03:20 henoheno Exp $
+// $Id: online.inc.php,v 1.12 2007/02/10 06:21:53 henoheno Exp $
 // Copyright (C)
 //   2002-2005 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -39,7 +39,7 @@ function plugin_online_itself($type = 0)
 		}
 
 		// Try read
-		if (plugin_online_check_online(& $count, $host)) {
+		if (plugin_online_check_online($count, $host)) {
 			$result = TRUE;
 		} else {
 			// Write
diff --git a/plugin/pcomment.inc.php b/plugin/pcomment.inc.php
index e826f04..e56ee8b 100644
--- a/plugin/pcomment.inc.php
+++ b/plugin/pcomment.inc.php
@@ -67,8 +67,6 @@ function plugin_pcomment_convert()
 	global $vars;
 	global $_pcmt_messages;
 
-	$ret = '';
-
 	$params = array(
 		'noname'=>FALSE,
 		'nodate'=>FALSE,
@@ -78,16 +76,14 @@ function plugin_pcomment_convert()
 		'_args' =>array()
 	);
 
-	// BugTrack2/106: Only variables can be passed by reference from PHP 5.0.5
-	$args = func_get_args(); // with array_walk()
-	array_walk($args, 'plugin_pcomment_check_arg', & $params);
+	foreach(func_get_args() as $arg)
+		plugin_pcomment_check_arg($arg, $params);
 
 	$vars_page = isset($vars['page']) ? $vars['page'] : '';
 	$page  = (isset($params['_args'][0]) && $params['_args'][0] != '') ? $params['_args'][0] :
 		sprintf(PLUGIN_PCOMMENT_PAGE, strip_bracket($vars_page));
-	$count = (isset($params['_args'][1]) && $params['_args'][1] != '') ? $params['_args'][1] : 0;
-	if ($count == 0 && $count !== '0')
-		$count = PLUGIN_PCOMMENT_NUM_COMMENTS;
+	$count = isset($params['_args'][1]) ? intval($params['_args'][1]) : 0;
+	if ($count == 0) $count = PLUGIN_PCOMMENT_NUM_COMMENTS;
 
 	$_page = get_fullname(strip_bracket($page), $vars_page);
 	if (!is_pagename($_page))
@@ -171,8 +167,7 @@ EOD;
 
 function plugin_pcomment_insert()
 {
-	global $script, $vars, $now;
-	global $_title_updated, $_no_name, $_pcmt_messages;
+	global $vars, $now, $_title_updated, $_no_name, $_pcmt_messages;
 
 	$refer = isset($vars['refer']) ? $vars['refer'] : '';
 	$page  = isset($vars['page'])  ? $vars['page']  : '';
@@ -303,7 +298,7 @@ function plugin_pcomment_auto_log($page, $dir, $count, & $postdata)
 }
 
 // Check arguments
-function plugin_pcomment_check_arg($val, $key, & $params)
+function plugin_pcomment_check_arg($val, & $params)
 {
 	if ($val != '') {
 		$l_val = strtolower($val);