harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use profile photo on vcard before reverting to xchan photo

Browse Source
This commit is contained in:
friendica 2014-02-11 19:51:43 -08:00
parent 95a45a119d
commit 655b6445d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Contact.php
View File

@ -114,7 +114,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
return replace_macros(get_markup_template('xchan_vcard.tpl'),array( return replace_macros(get_markup_template('xchan_vcard.tpl'),array(
'$name' => $xchan['xchan_name'], '$name' => $xchan['xchan_name'],
'$photo' => $xchan['xchan_photo_l'], '$photo' => ((array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']),
'$follow' => $xchan['xchan_addr'], '$follow' => $xchan['xchan_addr'],
'$connect' => $connect, '$connect' => $connect,
'$newwin' => (($mode === 'chanview') ? t('New window') : ''), '$newwin' => (($mode === 'chanview') ? t('New window') : ''),

2
include/auth.php
View File

@ -52,7 +52,7 @@ function account_verify_password($email,$pass) {
// Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention // Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention
$authlog = get_config('system', 'authlog'); $authlog = get_config('system', 'authlog');
if ($authlog) if ($authlog)
@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND); @file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
return null; return null;
} }