Continued rewriting a bit:

- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/include/items.php b/include/items.php
index 327096341c942cc4a355fac84691f6bdec39859c..8d95c3552973498e575b428819f72bebf67af1ae 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1260,7 +1260,7 @@ function tag_deliver($uid,$item_id) {
        $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
                intval($u[0]['uid'])
        );
-       if (! count($c)) {
+       if (! dbm::is_result($c)) {
                return;
        }
 
@@ -1293,8 +1293,6 @@ function tag_deliver($uid,$item_id) {
 
 function tgroup_check($uid,$item) {
 
-       $a = get_app();
-
        $mention = false;
 
        // check that the message originated elsewhere and is a top-level post

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 9e14a67d2e40451d8747a081bf447b83ce3e7c9d..7a134a7be190346c215d5d69b53ae208a576f098 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -28,7 +28,7 @@ function allfriends_content(App &$a) {
                intval(local_user())
        );
 
-       if (! count($c)) {
+       if (! dbm::is_result($c)) {
                return;
        }
 
@@ -71,20 +71,20 @@ function allfriends_content(App &$a) {
                }
 
                $entry = array(
-                       'url'           => $rr['url'],
-                       'itemurl'       => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-                       'name'          => htmlentities($contact_details['name']),
-                       'thumb'         => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
-                       'img_hover'     => htmlentities($contact_details['name']),
-                       'details'       => $contact_details['location'],
-                       'tags'          => $contact_details['keywords'],
-                       'about'         => $contact_details['about'],
-                       'account_type'  => account_type($contact_details),
-                       'network'       => network_to_name($contact_details['network'], $contact_details['url']),
-                       'photo_menu'    => $photo_menu,
-                       'conntxt'       => t('Connect'),
-                       'connlnk'       => $connlnk,
-                       'id'            => ++$id,
+                       'url'          => $rr['url'],
+                       'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+                       'name'         => htmlentities($contact_details['name']),
+                       'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+                       'img_hover'    => htmlentities($contact_details['name']),
+                       'details'      => $contact_details['location'],
+                       'tags'         => $contact_details['keywords'],
+                       'about'        => $contact_details['about'],
+                       'account_type' => account_type($contact_details),
+                       'network'      => network_to_name($contact_details['network'], $contact_details['url']),
+                       'photo_menu'   => $photo_menu,
+                       'conntxt'      => t('Connect'),
+                       'connlnk'      => $connlnk,
+                       'id'           => ++$id,
                );
                $entries[] = $entry;
        }