Merge remote-tracking branch 'origin/master'

joypixels · Feb 21, 2016 · cd7cbe9 · cd7cbe9
2 parents 1180450 + 8a9998b
commit cd7cbe9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/php/src/Client.php b/lib/php/src/Client.php
@@ -355,11 +355,16 @@ public function toShortCallback($m)
 
             if (!in_array($unicode, $unicode_replace))
             {
-                $unicode = substr($m[1], 0, 4);
+                $unicode .= "\xEF\xB8\x8F";
 
                 if (!in_array($unicode, $unicode_replace))
                 {
-                    return $m[0];
+                    $unicode = substr($m[1], 0, 4);
+
+                    if (!in_array($unicode, $unicode_replace))
+                    {
+                        return $m[0];
+                    }
                 }
             }