Merge pull request #135 from driver-by/master

Allow ascii emjoji before '?' symbol, remove unnecessary '.' escaping ...
joypixels · Oct 20, 2015 · 2372a14 · 2372a14
2 parents 79aab94 + ce18243
commit 2372a14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/js/emojione.js b/lib/js/emojione.js
diff --git a/lib/php/src/Client.php b/lib/php/src/Client.php
@@ -81,7 +81,7 @@ public function shortnameToUnicode($string)
             $ruleset = $this->getRuleset();
             $asciiRegexp = $ruleset->getAsciiRegexp();
 
-            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,\.]))/S', array($this, 'asciiToUnicodeCallback'), $string);
+            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))/S', array($this, 'asciiToUnicodeCallback'), $string);
         }
 
         return $string;
@@ -117,7 +117,7 @@ public function shortnameToImage($string)
             $ruleset = $this->getRuleset();
             $asciiRegexp = $ruleset->getAsciiRegexp();
 
-            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,\.]))/S', array($this, 'asciiToImageCallback'), $string);
+            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))/S', array($this, 'asciiToImageCallback'), $string);
         }
 
         return $string;