Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 21:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixings

Browse source 
- fixed test for semaphore
- fixed some issues
- changed namespace in Tests back to "src/"
- changed namings
This commit is contained in:
Philipp Holzer 2018-07-05 20:57:31 +02:00
parent 906bb25972
commit e41e7d2edd
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
15 changed files with 67 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/OStatus.php
View file

@ -4,6 +4,9 @@
*/
namespace Friendica\Protocol;
use dba;
use DOMDocument;
use DOMXPath;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache;
@ -22,9 +25,6 @@ use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
use dba;
use DOMDocument;
use DOMXPath;
require_once 'include/dba.php';
require_once 'include/items.php';
@ -513,9 +513,9 @@ class OStatus
logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
} else {
// We are having duplicated entries. Hopefully this solves it.
if (Lock::acquireLock('ostatus_process_item_insert')) {
if (Lock::acquire('ostatus_process_item_insert')) {
$ret = Item::insert($item);
Lock::releaseLock('ostatus_process_item_insert');
Lock::release('ostatus_process_item_insert');
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
} else {
$ret = Item::insert($item);