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

Merge remote-tracking branch 'upstream/dev' into wiki

Browse Source
This commit is contained in:
Andrew Manning
2016-06-05 16:52:02 -04:00
parent 0a3fbdd128 dd6718c2cd
commit 08a9553ccc
7 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/React.php
View File

@@ -35,7 +35,7 @@ class React extends \Zotlabs\Web\Controller {
$n['parent_mid'] = $i[0]['mid'];
$n['mid'] = item_message_id();
$n['verb'] = ACTIVITY_REACT . '#' . $emoji;
$n['body'] = "\n\n[zmg]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n";
$n['body'] = "\n\n[zmg=32x32]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n";
$n['author_xchan'] = $channel['channel_hash'];
$x = item_store($n);