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

Now the bugfix really should work

This commit is contained in:
Michael 2017-08-14 20:58:02 +00:00
parent 2d99e86b12
commit 4f6f47f714
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Contact.php
View File

@ -213,19 +213,22 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
$r = dba::inArray($s);
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!dbm::is_result($r))
if (!dbm::is_result($r)) {
$s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `nurl` = ? AND `uid` = 0",
normalise_link($url));
$r = dba::inArray($s);
$r = dba::inArray($s);
}
// Fetch the data from the gcontact table
if (!dbm::is_result($r))
if (!dbm::is_result($r)) {
$s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = ?",
normalise_link($url));
$r = dba::inArray($s);
}
if (dbm::is_result($r)) {
// If there is more than one entry we filter out the connector networks

4
include/dba.php
View File

@ -1338,6 +1338,10 @@ class dba {
* @return array Data array
*/
static public function inArray($stmt, $do_close = true) {
if (is_bool($stmt)) {
return $stmt;
}
$data = array();
while ($row = self::fetch($stmt)) {
$data[] = $row;

1
mod/hovercard.php
View File

@ -52,7 +52,6 @@ function hovercard_content() {
// Search for contact data
$contact = get_contact_details_by_url($nurl);
}
if(!is_array($contact))
return;