Better handling of the network field in the item table.

[friendica.git] / include / tags.php

diff --git a/include/tags.php b/include/tags.php
index c81a752d544ce2bb66947391982b41b47a9b8cb6..e5bc29cd4f5db6bb13662e4c1a6f35db8dde2935 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -79,6 +79,12 @@ function create_tags_from_item($itemid) {
        foreach ($tags as $tag=>$link) {
 
                if (substr(trim($tag), 0, 1) == "#") {
+                       // try to ignore #039 or #1 or anything like that
+                       if(ctype_digit(substr(trim($tag),1)))
+                               continue;
+                       // try to ignore html hex escapes, e.g. #x2317
+                       if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
+                               continue;
                        $type = TERM_HASHTAG;
                        $term = substr($tag, 1);
                } elseif (substr(trim($tag), 0, 1) == "@") {
@@ -106,8 +112,10 @@ function create_tags_from_item($itemid) {
 function create_tags_from_itemuri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       foreach ($messages as $message)
-               create_tags_from_item($message["id"]);
+       if(count($messages)) {
+               foreach ($messages as $message)
+                       create_tags_from_item($message["id"]);
+       }
 }
 
 function update_items() {