X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=0b825cc39940c4017a1087162cfa56a91db0347d;hb=aace55df0ad279d74c5e612078c3f29d114389dc;hp=ed37326df3190760708f63ba3d3df88cee1fb606;hpb=e9b33a6f1f42899a4d46cb23421085cdc2bbbaa6;p=friendica.git
diff --git a/include/text.php b/include/text.php
index ed37326df3..0b825cc399 100644
--- a/include/text.php
+++ b/include/text.php
@@ -610,6 +610,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
$url = $redirect_url;
$sparkle = ' sparkle';
}
+ else
+ $url = zrl($url);
}
$click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : '');
if($click)
@@ -712,6 +714,7 @@ function smilies($s, $sample = false) {
';-)',
':-(',
':-P',
+ ':-p',
':-"',
':-"',
':-x',
@@ -732,9 +735,8 @@ function smilies($s, $sample = false) {
':homebrew',
':coffee',
':facepalm',
- ':headdesk',
'~friendika',
- '~friendica',
+ '~friendica'
);
@@ -746,6 +748,7 @@ function smilies($s, $sample = false) {
'',
'
',
'
',
+ '
',
'
',
'
',
'
',
@@ -767,7 +770,7 @@ function smilies($s, $sample = false) {
'
',
'
',
'~friendika
',
- '~friendica
',
+ '~friendica
'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -939,6 +942,36 @@ function prepare_body($item,$attach = false) {
$s .= '
'; + + // Remove line breaks before the spoiler + while ((strpos($s, "\n".$spoilersearch) !== false)) + $s = str_replace("\n".$spoilersearch, $spoilersearch, $s); + while ((strpos($s, "
".$spoilersearch) !== false)) + $s = str_replace("
".$spoilersearch, $spoilersearch, $s); + + while ((strpos($s, $spoilersearch) !== false)) { + + $pos = strpos($s, $spoilersearch); + $rnd = random_string(8); + $spoilerreplace = '
'.sprintf(t('Click to open/close')).''. + '