X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FSmilies.php;h=d67b92d8b00f60a4e38ab0664510adb794b336ae;hb=1058b28ceabcec802932fc33bb79e6ce7814f945;hp=193f3b555ddd2986f7e3adf009928678eba0f57c;hpb=0e531e148e0693f305f3062046de27ae349262c4;p=friendica.git diff --git a/include/Smilies.php b/include/Smilies.php index 193f3b555d..d67b92d8b0 100644 --- a/include/Smilies.php +++ b/include/Smilies.php @@ -1,7 +1,8 @@ ', - '</3', - '<\\3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-p', - ':-\', - ':-\', - ':-x', - ':-X', - ':-D', - '8-|', - '8-O', - ':-O', - '\\o/', - 'o.O', - 'O.o', - 'o_O', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':homebrew', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica ~friendica', - 'redredmatrix', - 'redredmatrix' + '<3', + '</3', + '<\\3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-p', + ':-\', + ':-\', + ':-x', + ':-X', + ':-D', + '8-|', + '8-O', + ':-O', + '\\o/', + 'o.O', + 'O.o', + 'o_O', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':homebrew', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica ~friendica', + 'redred#matrix', + 'redred#matrixmatrix' ); $params = array('texts' => $texts, 'icons' => $icons); @@ -121,7 +122,7 @@ class Smilies { * @param string $s * @param boolean $sample * - * @return string + * @return string HML Output of the Smilie */ public static function replace($s, $sample = false) { if(intval(get_config('system','no_smilies')) @@ -164,7 +165,9 @@ class Smilies { * @brief expand <3333 to the correct number of hearts * * @param string $x - * @return string + * @return string HTML Output + * + * @todo: Rework because it doesn't work correctly */ private function preg_heart($x) { if(strlen($x[1]) == 1)