Merge remote-tracking branch 'upstream/develop' into ap1

This commit is contained in:
Michael 2018-09-24 21:48:40 +00:00
commit 834422d52f
25 changed files with 280 additions and 141 deletions

View file

@ -1936,6 +1936,7 @@ class Item extends BaseObject
} else {
// This shouldn't happen.
logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
Lock::release('item_insert_activity');
return false;
}
if ($locked) {