diff options
| -rw-r--r-- | include/attach.php | 2 | ||||
| -rw-r--r-- | include/event.php | 2 | ||||
| -rw-r--r-- | include/feedutils.php | 4 | ||||
| -rw-r--r-- | include/network.php | 6 | ||||
| -rw-r--r-- | include/photos.php | 2 | ||||
| -rw-r--r-- | vendor/composer/installed.php | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/include/attach.php b/include/attach.php index 02b94ddb6..bda4905f1 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1919,7 +1919,7 @@ function attach_store_item($channel, $observer, $file) { drop_item($r[0]['id'], $stage); if (empty($r[0]['item_hidden'])) { - Master::Summon(['Notifier', 'drop', $i[0]['id']]); + Master::Summon(['Notifier', 'drop', $r[0]['id']]); } } diff --git a/include/event.php b/include/event.php index 3509c1556..3cad0a355 100644 --- a/include/event.php +++ b/include/event.php @@ -13,7 +13,7 @@ use Zotlabs\Lib\Libsync; use Zotlabs\Access\AccessList; use Ramsey\Uuid\Uuid; -use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; +use Ramsey\Uuid\Exception\UnableToBuildUuidException; require_once('include/bbcode.php'); diff --git a/include/feedutils.php b/include/feedutils.php index cc57d106c..5894087b8 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -311,7 +311,7 @@ function get_atom_author($feed, $item) { $base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; if($base && count($base)) { foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) + if($link['attribs']['']['rel'] === 'alternate' && (!$author['author_link'])) $author['author_link'] = unxmlify($link['attribs']['']['href']); if(!x($author, 'author_photo') || ! $author['author_photo']) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') @@ -357,7 +357,7 @@ function get_atom_author($feed, $item) { if($base && count($base)) { foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) + if($link['attribs']['']['rel'] === 'alternate' && (!$author['author_link'])) $author['author_link'] = unxmlify($link['attribs']['']['href']); if(! (x($author,'author_photo'))) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') diff --git a/include/network.php b/include/network.php index a8ccee15c..d87482d9d 100644 --- a/include/network.php +++ b/include/network.php @@ -1489,11 +1489,11 @@ function do_delivery($deliveries, $force = false) { $interval = Config::Get('queueworker', 'queue_interval', 500000); -// $deliveries_per_process = intval(Config::Get('system','delivery_batch_count')); + $deliveries_per_process = intval(Config::Get('system', 'delivery_batch_count')); - if($deliveries_per_process <= 0) + if($deliveries_per_process <= 0) { $deliveries_per_process = 1; - + } $deliver = []; foreach($deliveries as $d) { diff --git a/include/photos.php b/include/photos.php index 390754f39..a9f92e103 100644 --- a/include/photos.php +++ b/include/photos.php @@ -580,7 +580,7 @@ function photo_upload($channel, $observer, $args) { $ret['item'] = $arr; $ret['body'] = $obj_body; $ret['resource_id'] = $photo_hash; - $ret['photoitem_id'] = $item_id; + $ret['photoitem_id'] = $result['item_id']; /** * @hooks photo_upload_end diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ab0b54ed5..f2f9fe2d9 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'zotlabs/hubzilla', 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', + 'reference' => '9fa18a55579bf4eafc4484536ed29335cd98b2a9', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -367,7 +367,7 @@ 'zotlabs/hubzilla' => array( 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', + 'reference' => '9fa18a55579bf4eafc4484536ed29335cd98b2a9', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), |