diff --git a/include/text.php b/include/text.php index 2956c9467..527f3a344 100644 --- a/include/text.php +++ b/include/text.php @@ -709,27 +709,20 @@ function smilies($s, $sample = false) { '</3', '<\\3', ':-)', -// ':)', ';-)', -// ';)', ':-(', -// ':(', ':-P', -// ':P', ':-"', ':-"', ':-x', ':-X', ':-D', -// ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', - '\\.../', - '\\ooo/', ":'(", ":-!", ":-/", @@ -739,12 +732,8 @@ function smilies($s, $sample = false) { ':homebrew', ':coffee', ':facepalm', - ':headdesk', '~friendika', - '~friendica', -// 'Diaspora*' - ':beard', - ':whitebeard' + '~friendica' ); @@ -753,27 +742,20 @@ function smilies($s, $sample = false) { '</3', '<\\3', ':-)', -// ':)', ';-)', -// ';)', ':-(', -// ':(', ':-P', -// ':P', ':-\', ':-\', ':-x', ':-X', ':-D', -// ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', - '\\.../', - '\\ooo/', ':\'(', ':-!', ':-/', @@ -783,12 +765,8 @@ function smilies($s, $sample = false) { ':homebrew', ':coffee', ':facepalm', - ':headdesk', '~friendika ~friendika', - '~friendica ~friendica', -// 'DiasporaDiaspora*', - ':beard', - ':whitebeard' + '~friendica ~friendica' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);