diff options
| author | friendica <info@friendica.com> | 2014-02-11 19:51:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-11 19:51:43 -0800 |
| commit | 655b6445d5f3354b0af3b9ee22b33be828499d41 (patch) | |
| tree | 6d3e8ee4303c88a8dabc4527501fe6c8a1ed235f /include | |
| parent | 95a45a119dd61241ae8d0f0f8eda467cff64d855 (diff) | |
| download | volse-hubzilla-655b6445d5f3354b0af3b9ee22b33be828499d41.tar.gz volse-hubzilla-655b6445d5f3354b0af3b9ee22b33be828499d41.tar.bz2 volse-hubzilla-655b6445d5f3354b0af3b9ee22b33be828499d41.zip | |
use profile photo on vcard before reverting to xchan photo
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 2 | ||||
| -rw-r--r-- | include/auth.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/Contact.php b/include/Contact.php index fd450033c..2dab62fd8 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -114,7 +114,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { return replace_macros(get_markup_template('xchan_vcard.tpl'),array( '$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'], '$connect' => $connect, '$newwin' => (($mode === 'chanview') ? t('New window') : ''), diff --git a/include/auth.php b/include/auth.php index a92f998bf..2b7c385fd 100644 --- a/include/auth.php +++ b/include/auth.php @@ -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 $authlog = get_config('system', '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; } |