Merge pull request #451 from annando/emailer

[friendica-addons.git] / unicode_smilies / unicode_smilies.php

diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index ec1561ab185b7a558d3a48364fddd8feeab835e3..85077c456b1371ec045b1e15b7626e96e5aa8312 100644 (file)
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -6,7 +6,7 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-require_once 'include/Smilies.php';
+use Friendica\Content\Smilies;
 
 function unicode_smilies_install() {
        register_hook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
@@ -25,7 +25,7 @@ function unicode_smilies_smilies(&$a,&$b) {
        Smilies::add($b, ':-D', '&#x1F601;');
        Smilies::add($b, ':D', '&#x1F601;');
        Smilies::add($b, ';-)', '&#x1F609;');
-       Smilies::add($b, ';)', '&#x1F609;');
+       // Smilies::add($b, ';)', '&#x1F609;'); // Deactivated since this leads to disturbed html entities
        Smilies::add($b, ':-P', '&#x1F61B;');
        Smilies::add($b, ':-p', '&#x1F61B;');
        Smilies::add($b, ':-O', '&#x1F62E;');