diff options
| author | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
| commit | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (patch) | |
| tree | fc60c2d05958c2a458ac72b03e1e7ddffce0c41b /include/conversation.php | |
| parent | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (diff) | |
| parent | b948fbaeda84f4358722222b4a2d5555ef10b82e (diff) | |
| download | volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.gz volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.bz2 volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.zip | |
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index a61f070a7..f76d3a27c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -610,10 +610,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $profile_link = zid($profile_link); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); - if(x($a->contacts,$normalised)) - $profile_avatar = $a->contacts[$normalised]['thumb']; - else - $profile_avatar = ((strlen($item['author-avatar'])) ? $a->get_cached_avatar_image($item['author-avatar']) : $item['thumb']); $profile_name = $item['author']['xchan_name']; $profile_link = $item['author']['xchan_url']; @@ -1129,6 +1125,9 @@ function status_editor($a,$x,$popup=false) { if(x($x,'nopreview')) $preview = ''; + $defexpire = ((($z = get_pconfig($x['profile_uid'],'system','default_post_expire')) && (! $webpage)) ? $z : ''); + + $cipher = get_pconfig($x['profile_uid'],'system','default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -1186,7 +1185,7 @@ function status_editor($a,$x,$popup=false) { '$preview' => $preview, '$source' => ((x($x,'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, - '$defexpire' => '', + '$defexpire' => $defexpire, '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false), '$expires' => t('Set expiration date'), '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), |