X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=unicode_smilies%2Funicode_smilies.php;h=faa553cc18cd2d31587cf280c48fac65523ead39;hb=0afd633346b517894ff8e92c705bd5d052dd06a2;hp=4ecea0c53c26f72084b0335e95eace53519521fc;hpb=642ab7f76fb1b12e61878d1ed6934feb81166993;p=friendica-addons.git

diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 4ecea0c5..faa553cc 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -5,15 +5,15 @@
  * Version: 1.0
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
-
-require_once 'include/Smilies.php';
+use Friendica\Core\Addon;
+use Friendica\Content\Smilies;
 
 function unicode_smilies_install() {
-	register_hook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
+	Addon::registerHook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
 }
 
 function unicode_smilies_uninstall() {
-	unregister_hook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
+	Addon::unregisterHook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
 }
 
 function unicode_smilies_smilies(&$a,&$b) {
@@ -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;');
@@ -117,11 +117,6 @@ function unicode_smilies_smilies(&$a,&$b) {
 //	Smilies::add($b, ':fartinbed', '&#x;');
 //	Smilies::add($b, ':fartblush', '&#x;');
 
-// Drinks
-
-	Smilies::add($b, ':tea', '&#x2615;');
-//	Smilies::add($b, ':drool', '&#x1F924;'); // Bad client support
-
 // Sad smileys
 
 	Smilies::add($b, ':crying', '&#x1F622;');
@@ -243,6 +238,11 @@ function unicode_smilies_smilies(&$a,&$b) {
 //  Regex killers - stick these at the bottom so they appear at the end of the English and
 //  at the start of $OtherLanguage.
 
+// Drinks
+
+	Smilies::add($b, ':tea', '&#x2615;');
+//	Smilies::add($b, ':drool', '&#x1F924;'); // Bad client support
+
 	Smilies::add($b, ':cool', '&#x1F192;');
 //	Smilies::add($b, ':vomit', '&#x1F92E;'); // Bad client support
 	Smilies::add($b, ':golf', '&#x1F3CC;');