Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion

[friendica.git] / mod / smilies.php

diff --git a/mod/smilies.php b/mod/smilies.php
index 4d498b674679608cc33e599d0afb9bfbdce0985c..c47f95da76a5cfc7656aee72dcf7cb667402931d 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,7 +1,3 @@
 <?php
 
-if(! function_exists('smilies_content')) {
-function smilies_content(&$a) {
-  return smilies('',true);
-}
-}
+function smilies_content(&$a) { return smilies('',true); }