X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=9fa1a410d37130eff5ad646e84f840c0c1011ba5;hb=b2d685482928363ce86c3c0519c8ff39d0af43ca;hp=90ab5a3aabbddf46c0db8d1f26ea98655ee3c7fe;hpb=69a73678ebc18ad27b27f1bf92bc9433b7e7066f;p=friendica.git
diff --git a/mod/subthread.php b/mod/subthread.php
index 90ab5a3aab..9fa1a410d3 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -3,7 +3,7 @@
* @file mod/subthread.php
*/
use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
@@ -13,8 +13,6 @@ use Friendica\Util\Security;
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function subthread_content(App $a) {
if (!local_user() && !remote_user()) {
@@ -89,7 +87,7 @@ function subthread_content(App $a) {
$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
- $link = XML::escape('' . "\n");
+ $link = XML::escape('' . "\n");
$body = $item['body'];
$obj = <<< EOT
@@ -130,7 +128,7 @@ EOT;
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $plink = '[url=' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+ $plink = '[url=' . System::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity;
@@ -151,8 +149,8 @@ EOT;
$arr['id'] = $post_id;
- Addon::callHooks('post_local_end', $arr);
+ Hook::callAll('post_local_end', $arr);
- killme();
+ exit();
}