aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-17 23:44:25 -0800
committerfriendica <info@friendica.com>2012-02-17 23:44:25 -0800
commit4222f506a82c7b2a50b602c51a83a85e1912450c (patch)
treec24402cf523fd3a93bb0c3c1ef0e63c5a5c687a3 /include
parent75acc1ed966a6bb3e3ec690a667d148f900dba9c (diff)
downloadvolse-hubzilla-4222f506a82c7b2a50b602c51a83a85e1912450c.tar.gz
volse-hubzilla-4222f506a82c7b2a50b602c51a83a85e1912450c.tar.bz2
volse-hubzilla-4222f506a82c7b2a50b602c51a83a85e1912450c.zip
deprecating two-char smilies
Diffstat (limited to 'include')
-rwxr-xr-xinclude/text.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/text.php b/include/text.php
index 8895f9813..45881b9a6 100755
--- a/include/text.php
+++ b/include/text.php
@@ -686,19 +686,19 @@ function smilies($s, $sample = false) {
'&lt;/3',
'&lt;\\3',
':-)',
- ':)',
+// ':)',
';-)',
- ';)',
+// ';)',
':-(',
- ':(',
+// ':(',
':-P',
- ':P',
+// ':P',
':-"',
':-&quot;',
':-x',
':-X',
':-D',
- ':D',
+// ':D',
'8-|',
'8-O',
':-O',
@@ -726,19 +726,19 @@ function smilies($s, $sample = false) {
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
- '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
+// '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
- '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',
+// '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',
'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
- '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
+// '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
- '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
+// '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
- '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',
+// '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',