X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftags.php;h=d809da2bf5e0115c2f4ce36fc503ae9bd33fec62;hb=3b5e1bbfc3f19dbe5199abdcbf598d69c2bdc234;hp=ac60f2f06c0cd0740a25b7d9d30e9a6b54b8da3b;hpb=09851331a9dc8601919cd0c9200686b92843d235;p=friendica.git

diff --git a/include/tags.php b/include/tags.php
index ac60f2f06c..d809da2bf5 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -55,10 +55,10 @@ function create_tags_from_item($itemid) {
 
 		if (substr(trim($tag), 0, 1) == "#") {
 			// try to ignore #039 or #1 or anything like that
-			if (ctype_digit(substr(trim($tag),1)))
+			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)))
+			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);
@@ -104,20 +104,18 @@ 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));
 
-	if (count($messages)) {
-		foreach ($messages as $message) {
+	if(count($messages)) {
+		foreach ($messages as $message)
 			create_tags_from_item($message["id"]);
-		}
 	}
 }
 
 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 = dba::p("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` = ''");
 
-	logger("fetched messages: ".count($messages));
-	while ($message = $db->qfetch()) {
+	logger("fetched messages: ".dba::num_rows($messages));
+	while ($message = dba::fetch($messages)) {
 
 		if ($message["uid"] == 0) {
 			$global = true;
@@ -136,15 +134,15 @@ function update_items() {
 			intval($global), intval(TERM_OBJ_POST), intval($message["oid"]));
 	}
 
-	$db->qclose();
+	dba::close($messages);
 
-	$messages = $db->q("SELECT `guid` FROM `item` WHERE `uid` = 0", true);
+	$messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
 
-	logger("fetched messages: ".count($messages));
-	while ($message = $db->qfetch()) {
+	logger("fetched messages: ".dba::num_rows($messages));
+	while ($message = dba::fetch(messages)) {
 		q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message["guid"]));
 	}
 
-	$db->qclose();
+	dba::close($messages);
 }
 ?>