mirror of
https://github.com/friendica/friendica
synced 2024-11-10 07:42:53 +00:00
Continued rewriting a bit:
- more usage of dbm::is_result() - nicer look of code Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
8db0be09b8
commit
5547bc2cc2
2 changed files with 16 additions and 18 deletions
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue