aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-07-12 13:00:14 +0200
committerMario <mario@mariovavti.com>2019-07-12 13:00:14 +0200
commite5370971d6c7c554cafd84403e14037e6082317f (patch)
treee28a4a66c1279b100e64b300066b8e1df827fa82
parent090d9210062e1ab5a666210551eed30a61fd609c (diff)
parent39c0a7525b27fa2f8fff8a6d67104ed98acbf046 (diff)
downloadvolse-hubzilla-e5370971d6c7c554cafd84403e14037e6082317f.tar.gz
volse-hubzilla-e5370971d6c7c554cafd84403e14037e6082317f.tar.bz2
volse-hubzilla-e5370971d6c7c554cafd84403e14037e6082317f.zip
Merge branch 'dev' into 'dev'
emoji reactions from hubzilla becoming top level posts on zap because of missing object See merge request hubzilla/core!1689
-rw-r--r--Zotlabs/Lib/Activity.php13
-rw-r--r--install/INSTALL.txt2
2 files changed, 14 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index c70d5f4dc..8168e7354 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -487,6 +487,19 @@ class Activity {
$ret['type'] = self::activity_mapper($i['verb']);
+ if($ret['type'] === 'emojiReaction') {
+ // There may not be an object for these items for legacy reasons - it should be the conversation parent.
+ $p = q("select * from item where mid = '%s' and uid = %d",
+ dbesc($i['parent_mid']),
+ intval($i['uid'])
+ );
+ if($p) {
+ xchan_query($p,true);
+ $p = fetch_post_tags($p,true);
+ $i['obj'] = self::encode_item($p[0]);
+ }
+ }
+
$ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/activity/' . urlencode($i['mid']));
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 0503ae2cc..b6014c160 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -83,7 +83,7 @@ web server platforms.
Example config scripts are available for these platforms in the install
directory. Apache and nginx have the most support.
- - PHP 5.6 or later.
+ - PHP 7.1 or later.
- PHP *command line* access with register_argc_argv set to true in the
php.ini file - and with no hosting provider restrictions on the use of