$local_uid = $r[0]['uid'];
- if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) {
+ if(! strstr($my_prvkey,'PRIVATE KEY')) {
$message = t('Our site encryption key is apparently messed up.');
xml_status(3,$message);
}
logger('dfrn_confirm: request: info updated');
- $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+ $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d LIMIT 1",
intval($dfrn_record)
);
if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
+ push_lang($r[0]['language']);
$tpl = (($new_relation == REL_BUD)
- ? load_view_file('view/friend_complete_eml.tpl')
- : load_view_file('view/intro_complete_eml.tpl'));
+ ? get_intltext_template('friend_complete_eml.tpl')
+ : get_intltext_template('intro_complete_eml.tpl'));
$email_tpl = replace_macros($tpl, array(
'$sitename' => $a->config['sitename'],
if(!$res) {
// pointless throwing an error here and confusing the person at the other end of the wire.
}
+ pop_lang();
}
xml_status(0); // Success
return; // NOTREACHED