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

fetch_first is now used / additional logging

This commit is contained in:
Michael 2018-02-22 09:51:59 +00:00
parent 046352606e
commit 2f2e7b9d5a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/Item.php
View File

@ -280,7 +280,7 @@ class Item extends BaseObject
if (!empty($contact_id)) { if (!empty($contact_id)) {
return $contact_id; return $contact_id;
} }
logger('Missing contact-id. Called by: '.System::callstack(), LOGGER_DEBUG);
/* /*
* First we are looking for a suitable contact that matches with the author of the post * First we are looking for a suitable contact that matches with the author of the post
* This is done only for comments * This is done only for comments
@ -483,6 +483,8 @@ class Item extends BaseObject
} }
if ($item['network'] == NETWORK_PHANTOM) { if ($item['network'] == NETWORK_PHANTOM) {
logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
$contact = Contact::getDetailsByURL($item['author-link'], $item['uid']); $contact = Contact::getDetailsByURL($item['author-link'], $item['uid']);
if (!empty($contact['network'])) { if (!empty($contact['network'])) {
$item['network'] = $contact["network"]; $item['network'] = $contact["network"];
@ -1158,11 +1160,11 @@ class Item extends BaseObject
// Does the given user have this item? // Does the given user have this item?
if ($uid) { if ($uid) {
$items = dba::p("SELECT `item`.`id`, `user`.`nickname` FROM `item` $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid); AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
if ($item = dba::fetch($items)) { if (DBM::is_result($item)) {
$id = $item["id"]; $id = $item["id"];
$nick = $item["nickname"]; $nick = $item["nickname"];
} }
@ -1170,14 +1172,14 @@ class Item extends BaseObject
// Or is it anywhere on the server? // Or is it anywhere on the server?
if ($nick == "") { if ($nick == "") {
$items = dba::p("SELECT `item`.`id`, `user`.`nickname` FROM `item` $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND NOT `item`.`private` AND `item`.`wall` AND NOT `item`.`private` AND `item`.`wall`
AND `item`.`guid` = ?", $guid); AND `item`.`guid` = ?", $guid);
if ($item = dba::fetch($items)) { if (DBM::is_result($item)) {
$id = $item["id"]; $id = $item["id"];
$nick = $item["nickname"]; $nick = $item["nickname"];
} }