Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
bb9feee370
@ -880,7 +880,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
|||||||
$url = 'http://getzot.com';
|
$url = 'http://getzot.com';
|
||||||
$newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]';
|
$newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]';
|
||||||
$body = str_replace($tag,$newtag,$body);
|
$body = str_replace($tag,$newtag,$body);
|
||||||
$replace = true;
|
$replaced = true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//base tag has the tags name only
|
//base tag has the tags name only
|
||||||
|
4471
view/it/messages.po
4471
view/it/messages.po
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user