Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 04:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of ../p3 into dev

Browse source
This commit is contained in:
nobody 2020-12-19 13:10:17 -08:00
commit 06ae51f854
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Zotlabs/Lib/Activity.php
View file

@ -2071,6 +2071,11 @@ class Activity {
);
if ($x) {
// a name starting with a left paren can trick the markdown parser into creating a link so insert a zero-width space
if (substr($x[0]['xchan_name'],0,1) === '(') {
$x[0]['xchan_name'] = htmlspecialchars_decode('​',ENT_QUOTES) . $x[0]['xchan_name'];
}
return sprintf('@[zrl=%s]%s[/zrl]',$x[0]['xchan_url'],$x[0]['xchan_name']);
}
return '@{' . $id . '}';

2
Zotlabs/Module/Search.php
View file

@ -72,7 +72,7 @@ class Search extends Controller {
$item = Activity::decode_note($AS,true);
if ($item) {
logger('parsed_item: ' . print_r($item,true),LOGGER_DATA);
Activity::store(App::get_channel(),get_observer_hash,$AS,$item, true, true);
Activity::store(App::get_channel(),get_observer_hash(),$AS,$item, true, true);
goaway(z_root() . '/display/' . gen_link_id($item['mid']));
}
}