Merge pull request #150 from frankmayer/devel

frankmayer · frankmayer · commit 1269578ce9db · 2013-10-19T07:22:21.000-07:00
Leaner and meaner regex utf-8 check :)
diff --git a/lib/triagens/ArangoDb/Connection.php b/lib/triagens/ArangoDb/Connection.php
@@ -538,20 +538,7 @@ private function doBatch($method, $request)
      */
     public static function detect_utf($string)
     {
-        if (preg_match(
-            '%^(?:
-                      [\x09\x0A\x0D\x20-\x7E]            # ASCII
-                    | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-                    | \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-                    | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-                    | \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-                    | \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-                    | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-                    | \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-                )*$%xs',
-            $string
-        )
-        ) {
+        if (preg_match("//u", $string)) {
             return true;
         } else {
             return false;
