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

2018-09-24 21:48:40 +00:00
parent 5e3f71680c d019a87ecc
commit 834422d52f
25 changed files with 280 additions and 141 deletions
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -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) {