Index: branches/5.2.x/core/units/helpers/deployment_helper.php
===================================================================
diff -u -N -r15588 -r15601
--- branches/5.2.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15588)
+++ branches/5.2.x/core/units/helpers/deployment_helper.php	(.../deployment_helper.php)	(revision 15601)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: deployment_helper.php 15588 2012-10-18 15:30:36Z alex $
+* @version	$Id: deployment_helper.php 15601 2012-11-02 14:18:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -422,7 +422,7 @@
 				}
 				elseif ( $sql ) {
 					$this->toLog($sql . ' ... ', false);
-					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', ($this->isCommandLine ? $sql : htmlspecialchars($sql)))), 0, self::SQL_TRIM_LENGTH) . ' ... ';
+					echo mb_substr(trim(preg_replace('/(\n|\t| )+/is', ' ', ($this->isCommandLine ? $sql : htmlspecialchars($sql, null, CHARSET)))), 0, self::SQL_TRIM_LENGTH) . ' ... ';
 
 					$this->Conn->Query($sql);
 
@@ -563,7 +563,7 @@
 
 		$html_color = $html_color_map[$color][$bold ? 'bold' : 'normal'];
 
-		return '<span style="color: ' . $html_color . '">' . htmlspecialchars($text) . '</span>';
+		return '<span style="color: ' . $html_color . '">' . htmlspecialchars($text, null, CHARSET) . '</span>';
 	}
 
 	/**
@@ -579,7 +579,7 @@
 			return "\033[1m" . $text . "\033[0m";
 		}
 
-		return '<strong>' . htmlspecialchars($text) . '</strong>';
+		return '<strong>' . htmlspecialchars($text, null, CHARSET) . '</strong>';
 	}
 
 	/**
@@ -611,7 +611,7 @@
 	private function out($text, $new_line = false)
 	{
 		if ( !$this->isCommandLine ) {
-			$text = htmlspecialchars($text);
+			$text = htmlspecialchars($text, null, CHARSET);
 		}
 
 		echo $text . ($new_line ? PHP_EOL : '');