diff options
| author | friendica <info@friendica.com> | 2013-06-14 16:54:58 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-14 16:54:58 -0700 |
| commit | 765d6e0a97f135755d6ec1322f6e3272bc0ae620 (patch) | |
| tree | ac7d0691343a0c0951ff19b1ee46cd21afaf3c4c /include/conversation.php | |
| parent | 9b67e114ad9da2b5e0456709affd20d9c760e4ae (diff) | |
| download | volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.tar.gz volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.tar.bz2 volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.zip | |
push refresh messages, performance work on conversations and configs, doc updates
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 13f67c4dd..8e69e9ea3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -365,7 +365,7 @@ function visible_activity($item) { * */ -if(!function_exists('conversation')) { + function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tstart = dba_timer(); @@ -374,6 +374,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $ssl_state = ((local_user()) ? true : false); + if(local_user()) + load_pconfig(local_user(),''); $arr_blocked = null; @@ -678,6 +680,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { } else { + // Normal View // logger('conv: items: ' . print_r($items,true)); @@ -790,7 +793,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { return $o; -}} +} function best_link_url($item) { |