bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'rewrites/app_get_baseurl_static' into develop

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
This commit is contained in:
Roland Häder 2016-12-22 11:37:23 +01:00
commit 20e71d21a6
11 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/dfrn_confirm.php
View file

@ -588,7 +588,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($decrypted_source_url),
intval($local_uid)
);
if(! dbm::is_result($ret)) {
if(! count($ret)) {
if(strstr($decrypted_source_url,'http:'))
$newurl = str_replace('http:','https:',$decrypted_source_url);
else
@ -598,7 +598,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($newurl),
intval($local_uid)
);
if(! dbm::is_result($ret)) {
if(! count($ret)) {
// this is either a bogus confirmation (?) or we deleted the original introduction.
$message = t('Contact record was not found for you on our site.');
xml_status(3,$message);