Don't cherry-pick:
- reverted dbm::is_result() to count() Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
361a55155c
commit
4805aa8fdb
|
@ -584,7 +584,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
dbesc($decrypted_source_url),
|
dbesc($decrypted_source_url),
|
||||||
intval($local_uid)
|
intval($local_uid)
|
||||||
);
|
);
|
||||||
if(! dbm::is_result($ret)) {
|
if(! count($ret)) {
|
||||||
if(strstr($decrypted_source_url,'http:'))
|
if(strstr($decrypted_source_url,'http:'))
|
||||||
$newurl = str_replace('http:','https:',$decrypted_source_url);
|
$newurl = str_replace('http:','https:',$decrypted_source_url);
|
||||||
else
|
else
|
||||||
|
@ -594,7 +594,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
dbesc($newurl),
|
dbesc($newurl),
|
||||||
intval($local_uid)
|
intval($local_uid)
|
||||||
);
|
);
|
||||||
if(! dbm::is_result($ret)) {
|
if(! count($ret)) {
|
||||||
// this is either a bogus confirmation (?) or we deleted the original introduction.
|
// this is either a bogus confirmation (?) or we deleted the original introduction.
|
||||||
$message = t('Contact record was not found for you on our site.');
|
$message = t('Contact record was not found for you on our site.');
|
||||||
xml_status(3,$message);
|
xml_status(3,$message);
|
||||||
|
|
Loading…
Reference in a new issue