harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-03-25 14:40:31 -07:00
parent 5c63f7dd58 2115eb26a7
commit e5e0a6b31f
178 changed files with 15561 additions and 11282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/text.php
View File

@@ -1456,11 +1456,10 @@ function format_hashtags(&$item) {
continue;
if(strpos($item['body'], $t['url']))
continue;
if($s)
$s .= '&nbsp';
$s .= ' ';
$s .= '#<a href="' . zid($t['url']) . '" >' . $term . '</a>';
$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
}
}
@@ -1480,11 +1479,9 @@ function format_mentions(&$item) {
continue;
if(strpos($item['body'], $t['url']))
continue;
if($s)
$s .= '&nbsp';
$s .= '@<a href="' . zid($t['url']) . '" >' . $term . '</a>';
$s .= ' ';
$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
}
}