friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid undefined index

This commit is contained in:
Michael 2018-07-08 04:55:45 +00:00
parent 43a7a1647d
commit 5ee2db8a16
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Model/Item.php
View File

@ -181,7 +181,7 @@ class Item extends BaseObject
if (array_key_exists('object-type', $row)) { if (array_key_exists('object-type', $row)) {
$row['object-type'] = ACTIVITY_OBJ_NOTE; $row['object-type'] = ACTIVITY_OBJ_NOTE;
} }
} elseif (in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) { } elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
// Posts don't have an object or target - but having tags or files. // Posts don't have an object or target - but having tags or files.
// We safe some performance by building tag and file strings only here. // We safe some performance by building tag and file strings only here.
// We remove object and target since they aren't used for this type. // We remove object and target since they aren't used for this type.
@ -191,15 +191,16 @@ class Item extends BaseObject
if (array_key_exists('target', $row)) { if (array_key_exists('target', $row)) {
$row['target'] = ''; $row['target'] = '';
} }
// Build the tag string out of the term entries }
if (array_key_exists('tag', $row) && empty($row['tag'])) {
$row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
}
// Build the file string out of the term entries // Build the tag string out of the term entries
if (array_key_exists('file', $row) && empty($row['file'])) { if (array_key_exists('tag', $row) && empty($row['tag'])) {
$row['file'] = Term::fileTextFromItemId($row['internal-iid']); $row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
} }
// Build the file string out of the term entries
if (array_key_exists('file', $row) && empty($row['file'])) {
$row['file'] = Term::fileTextFromItemId($row['internal-iid']);
} }
// Remove internal fields // Remove internal fields