fixes #2215

git-svn-id: http://dev.piwik.org/svn/trunk@4163 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 30 insertions, 0 deletions

diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php
index a3274a541e..919f64f317 100644
--- a/libs/upgradephp/upgrade.php
+++ b/libs/upgradephp/upgrade.php
@@ -979,3 +979,33 @@ function _readfile($filename, $useIncludePath = false, $context = null)
 	}
 	return false;
 }
+
+/**
+ * utf8_encode replacement
+ *
+ * @param string $data
+ * @return string
+ */
+if (!function_exists('utf8_encode')) {
+	function utf8_encode($data) {
+		if (function_exists('iconv')) {
+			return @iconv('ISO-8859-1', 'UTF-8', $data);
+		}
+		return $data;
+	}
+}
+
+/**
+ * utf8_decode replacement
+ *
+ * @param string $data
+ * @return string
+ */
+if (!function_exists('utf8_decode')) {
+	function utf8_decode($data) {
+		if (function_exists('iconv')) {
+			return @iconv('UTF-8', 'ISO-8859-1', $data);
+		}
+		return $data;
+	}
+}