Move htmlspecialchars_utf8 from Request to Helper

And remove html_chars_utf8 to use htmlspecialchars_utf8 instead in
importExportController

3 files changed, 12 insertions, 11 deletions

diff --git a/lib/Minz/Helper.php b/lib/Minz/Helper.php
index b058211d3..13bfdd93e 100644
--- a/lib/Minz/Helper.php
+++ b/lib/Minz/Helper.php
@@ -19,4 +19,15 @@ class Minz_Helper {
 			return stripslashes($var);
 		}
 	}
+
+	/**
+	 * Wrapper for htmlspecialchars.
+	 * Force UTf-8 value and can be used on array too.
+	 */
+	public static function htmlspecialchars_utf8($p) {
+		if (is_array($p)) {
+			return array_map('self::htmlspecialchars_utf8', $p);
+		}
+		return htmlspecialchars($p, ENT_COMPAT, 'UTF-8');
+	}
 }
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index f3ecaf55c..52f53012f 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -27,19 +27,13 @@ class Minz_Request {
 	public static function params() {
 		return self::$params;
 	}
-	static function htmlspecialchars_utf8($p) {
-		if (is_array($p)) {
-			return array_map('self::htmlspecialchars_utf8', $p);
-		}
-		return htmlspecialchars($p, ENT_COMPAT, 'UTF-8');
-	}
 	public static function param($key, $default = false, $specialchars = false) {
 		if (isset(self::$params[$key])) {
 			$p = self::$params[$key];
 			if (is_object($p) || $specialchars) {
 				return $p;
 			} else {
-				return self::htmlspecialchars_utf8($p);
+				return Minz_Helper::htmlspecialchars_utf8($p);
 			}
 		} else {
 			return $default;
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 86c0a4ae4..823f53716 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -230,7 +230,3 @@ function cryptAvailable() {
 	}
 	return false;
 }
-
-function html_chars_utf8($str) {
-	return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
-}