Merge pull request #2110 from annando/1511-subscribe-feed

[friendica.git] / include / tags.php

diff --git a/include/tags.php b/include/tags.php
index e3e4edfa17f9c21a024083b01b365839b7b496de..a8bcae86dcc3783c13bbbc8ab6466517db431f1e 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -37,6 +37,9 @@ function create_tags_from_item($itemid) {
 
        $data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
 
+       // ignore anything in a code block
+       $data = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$data);
+
        $tags = array();
 
        $pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
@@ -112,8 +115,7 @@ function create_tags_from_itemuri($itemuri, $uid) {
 function update_items() {
        global $db;
 
-//        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''", true);
-        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1", true);
+        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''", true);
 
         logger("fetched messages: ".count($messages));
         while ($message = $db->qfetch()) {
@@ -129,12 +131,21 @@ function update_items() {
 
                        $global = (count($isglobal) > 0);
                }
-echo $message["created"]." - ".$message["guid"]."\n";
+
                q("UPDATE `term` SET `guid` = '%s', `created` = '%s', `received` = '%s', `global` = %d WHERE `otype` = %d AND `oid` = %d",
                        dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]),
                        intval($global), intval(TERM_OBJ_POST), intval($message["oid"]));
        }
 
         $db->qclose();
+
+       $messages = $db->q("SELECT `guid` FROM `item` WHERE `uid` = 0", true);
+
+       logger("fetched messages: ".count($messages));
+       while ($message = $db->qfetch()) {
+               q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message["guid"]));
+       }
+
+       $db->qclose();
 }
 ?>