Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 15:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential bugs without expected behavior change

Browse source 
- Fix uninitialized variables
- Fix potentially not set variables
- Fix wrong parameter default value
- Fix method scope
- Fix missing return value
This commit is contained in:
Hypolite Petovan 2019-01-07 12:51:48 -05:00
parent 45ada943b4
commit 7f2dc40601
35 changed files with 87 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Model/Contact.php
View file

@ -35,12 +35,6 @@ class Contact extends BaseObject
* @deprecated since version 2019.03
* @see User::PAGE_FLAGS_NORMAL
*/
const PAGE_NORMAL = 0;
const PAGE_SOAPBOX = 1;
const PAGE_COMMUNITY = 2;
const PAGE_FREELOVE = 3;
const PAGE_BLOG = 4;
const PAGE_PRVGROUP = 5;
const PAGE_NORMAL = User::PAGE_FLAGS_NORMAL;
/**
* @deprecated since version 2019.03
@ -1205,9 +1199,10 @@ class Contact extends BaseObject
$contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
}
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
if (!DBA::isResult($contact)) {
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
$condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
$contact = DBA::selectFirst('contact', $fields, $condition);
}
@ -1426,7 +1421,7 @@ class Contact extends BaseObject
{
$a = self::getApp();
$cid = Self::getIdForURL($contact_url);
$cid = self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
if (!DBA::isResult($contact)) {