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

This commit is contained in:
zottel 2016-06-05 01:48:27 +02:00
commit f89b7ac9e1

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);