Fixed encoding issue

diff --git a/wcfsetup/install/files/lib/util/UserUtil.class.php b/wcfsetup/install/files/lib/util/UserUtil.class.php
index 34d2da8f47e3fd6411733da1bd3a9d373de96bba..e385ca5cfb4fe99f67ed8ab85603e8a2413998cd 100644 (file)
--- a/wcfsetup/install/files/lib/util/UserUtil.class.php
+++ b/wcfsetup/install/files/lib/util/UserUtil.class.php
@@ -100,7 +100,14 @@ final class UserUtil {
         * @return      string
         */
        public static function getUserAgent() {
-               if (isset($_SERVER['HTTP_USER_AGENT'])) return substr($_SERVER['HTTP_USER_AGENT'], 0, 255);
+               if (isset($_SERVER['HTTP_USER_AGENT'])) {
+                       $userAgent = $_SERVER['HTTP_USER_AGENT'];
+                       if (!StringUtil::isASCII($userAgent) && !StringUtil::isUTF8($userAgent)) {
+                               $userAgent = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $userAgent);
+                       }
+                       
+                       return mb_substr($userAgent, 0, 255);
+               }
                return '';
        }