X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=5d3d1923e4425958b4d53a00e3ea436cd8553c76;hb=708ffaff51d3f5112af6b1fbd25d7ff6391e496e;hp=5a8047414d648fc1c1d34771e971205fad832de3;hpb=6b845b35d3c525a7fdef3443c39ce31dd9a8ada6;p=friendica.git

diff --git a/mod/tagger.php b/mod/tagger.php
index 5a8047414d..5d3d1923e4 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -3,7 +3,7 @@
  * @file mod/tagger.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\Model\Item;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function tagger_content(App $a) {
 
 	if (!local_user() && !remote_user()) {
@@ -42,14 +40,12 @@ function tagger_content(App $a) {
 	}
 
 	$owner_uid = $item['uid'];
-	$owner_nick = '';
 	$blocktags = 0;
 
-	$r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
+	$r = q("select `blocktags` from user where uid = %d limit 1",
 		intval($owner_uid)
 	);
 	if (DBA::isResult($r)) {
-		$owner_nick = $r[0]['nickname'];
 		$blocktags = $r[0]['blocktags'];
 	}
 
@@ -71,14 +67,9 @@ function tagger_content(App $a) {
 	$xterm = XML::escape($term);
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
+	$href = System::baseUrl() . '/display/' . $item['guid'];
 
-	if ($owner_nick) {
-		$href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
-	} else {
-		$href = System::baseUrl() . '/display/' . $item['guid'];
-	}
-
-	$link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
+	$link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
 	$body = XML::escape($item['body']);
 
@@ -201,11 +192,9 @@ EOT;
 
 	$arr['id'] = $post_id;
 
-	Addon::callHooks('post_local_end', $arr);
+	Hook::callAll('post_local_end', $arr);
 
 	Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
 
-	killme();
-
-	return; // NOTREACHED
+	exit();
 }