X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=717c0947769d47b9fb30bd6101332e4a90c22e47;hb=80a4e6263fd53f83a710d2a2e6c57baae38cb14b;hp=fa8dc35301f017898a15808171d8bc3c17c5b416;hpb=97e95473a1f4d748e9f61f4d430a68bfedeae222;p=friendica.git

diff --git a/mod/tagger.php b/mod/tagger.php
index fa8dc35301..717c094776 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -32,7 +32,7 @@ function tagger_content(App $a) {
 	logger('tagger: tag ' . $term . ' item ' . $item_id);
 
 
-	$item = Item::selectFirst(local_user(), [], ['id' => $item_id]);
+	$item = Item::selectFirst([], ['id' => $item_id]);
 
 	if (!$item_id || !DBM::is_result($item)) {
 		logger('tagger: no item ' . $item_id);
@@ -65,7 +65,7 @@ function tagger_content(App $a) {
 		return;
 	}
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = Item::newURI($owner_uid);
 	$xterm = xmlify($term);
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
@@ -175,23 +175,19 @@ EOT;
 	}
 
 	// if the original post is on this site, update it.
-
-	$r = q("SELECT `tag`,`id`,`uid` FROM `item` WHERE `origin`=1 AND `uri`='%s' LIMIT 1",
-		dbesc($item['uri'])
-	);
-
-	if (DBM::is_result($r)) {
+	$original_item = Item::selectFirst(['tag', 'id', 'uid'], ['origin' => true, 'uri' => $item['uri']]);
+	if (DBM::is_result($original_item)) {
 		$x = q("SELECT `blocktags` FROM `user` WHERE `uid`=%d LIMIT 1",
-			intval($r[0]['uid'])
+			intval($original_item['uid'])
 		);
 		$t = q("SELECT COUNT(`tid`) AS `tcount` FROM `term` WHERE `oid`=%d AND `term`='%s'",
-			intval($r[0]['id']),
+			intval($original_item['id']),
 			dbesc($term)
 		);
 
 		if (DBM::is_result($x) && !$x[0]['blocktags'] && $t[0]['tcount'] == 0){
 			q("INSERT INTO term (`oid`, `otype`, `type`, `term`, `url`, `uid`) VALUE (%d, %d, %d, '%s', '%s', %d)",
-				intval($r[0]['id']),
+				intval($original_item['id']),
 				$term_objtype,
 				TERM_HASHTAG,
 				dbesc($term),