aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-05 16:52:02 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-05 16:52:02 -0400
commit08a9553ccc0fd883a77fbf36be5941ba119deda1 (patch)
treed9ec5063c463f135c51d34fa2963a69965a8aad2 /Zotlabs
parent0a3fbdd128dd3b80868c93cb93901b501edf576c (diff)
parentdd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 (diff)
downloadvolse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.gz
volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.bz2
volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/React.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/React.php b/Zotlabs/Module/React.php
index 28c7c239c..ed4f87e7e 100644
--- a/Zotlabs/Module/React.php
+++ b/Zotlabs/Module/React.php
@@ -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);