keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't update the basepath on local check

Browse source
This commit is contained in:
Michael 2019-09-21 13:17:33 +00:00
parent cf569425c6
commit b24ef7247d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -270,14 +270,17 @@ class Contact extends BaseObject
* @param string $url The contact link * @param string $url The contact link
* *
* @return string basepath * @return string basepath
* @return boolean $dont_update Don't update the contact
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getBasepath($url) public static function getBasepath($url, $dont_update = false)
{ {
$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
if (!empty($contact['baseurl'])) { if (!empty($contact['baseurl'])) {
return $contact['baseurl']; return $contact['baseurl'];
} elseif ($dont_update) {
return '';
} }
self::updateFromProbeByURL($url, true); self::updateFromProbeByURL($url, true);
@ -299,8 +302,7 @@ class Contact extends BaseObject
*/ */
public static function isLocal($url) public static function isLocal($url)
{ {
return Strings::compareLink(self::getBasepath($url), System::baseUrl()); return Strings::compareLink(self::getBasepath($url, true), System::baseUrl());
} }
/** /**