aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Lib/Activity.php7
-rw-r--r--view/it/hstrings.php2
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 416aaa0d8..f309433c3 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -676,7 +676,7 @@ class Activity {
$ret = [];
- if (isset($item['attachment'])) {
+ if (isset($item['attachment']) && is_array($obj['attachment'])) {
$ptr = $item['attachment'];
if (!array_key_exists(0, $ptr)) {
$ptr = [$ptr];
@@ -2413,7 +2413,10 @@ class Activity {
$s['item_deleted'] = 1;
}
- $s['obj_type'] = self::activity_obj_decode_mapper($act->obj['type']);
+ if (isset($act->obj['type'])) {
+ $s['obj_type'] = self::activity_obj_mapper($act->obj['type']);
+ }
+
if ($s['obj_type'] === ACTIVITY_OBJ_NOTE && $s['mid'] !== $s['parent_mid']) {
$s['obj_type'] = ACTIVITY_OBJ_COMMENT;
}
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 956e0bea7..f3b8909fc 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -1338,7 +1338,7 @@ App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per es
App::$strings["Since (date)"] = "dal (data)";
App::$strings["Tell us about yourself"] = "Raccontaci di te...";
App::$strings["Homepage URL"] = "Indirizzo home page";
-App::$strings["Hometown"] = "Città dove vivo";
+App::$strings["Hometown"] = "Città natale";
App::$strings["Political views"] = "Orientamento politico";
App::$strings["Religious views"] = "Orientamento religioso";
App::$strings["Keywords used in directory listings"] = "Parole chiavi mostrate nell'elenco dei canali";