friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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:
Roland Häder 2016-12-22 17:03:00 +01:00
parent 8db0be09b8
commit 5547bc2cc2
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -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", $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
intval($u[0]['uid']) intval($u[0]['uid'])
); );
if (! count($c)) { if (! dbm::is_result($c)) {
return; return;
} }
@ -1293,8 +1293,6 @@ function tag_deliver($uid,$item_id) {
function tgroup_check($uid,$item) { function tgroup_check($uid,$item) {
$a = get_app();
$mention = false; $mention = false;
// check that the message originated elsewhere and is a top-level post // check that the message originated elsewhere and is a top-level post

30
mod/allfriends.php
View File

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