Merge pull request #5193 from annando/dbstructure

[friendica.git] / src / Model / Term.php

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 03f19197a361705910867c8400e6c6d24f119713..fd44603f978f33a8aff6eb18964875aeca2d9442 100644 (file)
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -29,8 +29,7 @@ class Term
                }
 
                // Clean up all tags
-               dba::e("DELETE FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?)",
-                       TERM_OBJ_POST, $itemid, TERM_HASHTAG, TERM_MENTION);
+               dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
 
                if ($message['deleted']) {
                        return;
@@ -135,11 +134,7 @@ class Term
                }
 
                // Clean up all tags
-               q("DELETE FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
-                       intval(TERM_OBJ_POST),
-                       intval($itemid),
-                       intval(TERM_FILE),
-                       intval(TERM_CATEGORY));
+               dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
 
                if ($message["deleted"]) {
                        return;
@@ -201,7 +196,7 @@ class Term
 
                        $orig_tag = $tag["url"];
 
-                       $tag["url"] = best_link_url($item, $sp, $tag["url"]);
+                       $tag["url"] = Contact::magicLinkById($item['author-id'], $tag['url']);
 
                        if ($tag["type"] == TERM_HASHTAG) {
                                if ($orig_tag != $tag["url"]) {