diff options
| author | friendica <info@friendica.com> | 2013-02-04 17:46:04 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-04 17:46:04 -0800 |
| commit | da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561 (patch) | |
| tree | fe259a2abd9d7e07ecdbc64af822e69f817de7f5 | |
| parent | ff0a73bf40d0503eb5a4d48be60666b73c47d4f9 (diff) | |
| download | volse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.tar.gz volse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.tar.bz2 volse-hubzilla-da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561.zip | |
fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right.
| -rw-r--r-- | include/conversation.php | 10 | ||||
| -rw-r--r-- | mod/channel.php | 4 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | view/tpl/search_item.tpl | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php index 179bc8e0f..03f53980d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -583,6 +583,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { //$tmp_item = replace_macros($tpl,array( $tmp_item = array( 'template' => $tpl, + 'toplevel' => 'toplevel_item', 'tags' => $tags, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), @@ -632,8 +633,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $arr = array('item' => $item, 'output' => $tmp_item); call_hooks('display_item', $arr); - $threads[$threadsid]['id'] = $item['item_id']; - $threads[$threadsid]['items'] = array($arr['output']); +// $threads[$threadsid]['id'] = $item['item_id']; + $threads[] = $arr['output']; } @@ -705,6 +706,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { if($page_mode === 'preview') logger('preview: ' . print_r($threads,true)); +// logger('page_template: ' . $page_template); // logger('nouveau: ' . print_r($threads,true)); @@ -720,8 +722,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { '$dropping' => ($page_dropping?t('Delete Selected Items'):False), )); - if($page_mode === 'preview') - logger('preview: ' . $o); +// if($page_mode === 'preview') +// logger('preview: ' . $o); return $o; diff --git a/mod/channel.php b/mod/channel.php index c74b40c00..f3e247399 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -145,7 +145,7 @@ function channel_content(&$a, $update = 0, $load = false) { if(($update) && (! $load)) { - $r = q("SELECT distinct(parent) AS `item_id` from item + $r = q("SELECT distinct parent AS `item_id` from item left join abook on item.author_xchan = abook.abook_xchan WHERE uid = %d AND item_restrict = 0 AND (item_flags & %d) AND ( item_flags & %d ) @@ -178,7 +178,7 @@ function channel_content(&$a, $update = 0, $load = false) { $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { - $r = q("SELECT id AS item_id FROM item + $r = q("SELECT distinct id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan WHERE uid = %d AND item_restrict = 0 AND (item_flags & %d) and (item_flags & %d) diff --git a/mod/network.php b/mod/network.php index 837ac7aea..fb457a7f1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -622,7 +622,7 @@ function network_content(&$a, $update = 0, $load = false) { // Fetch a page full of parent items for this page - $r = q("SELECT item.id AS item_id FROM item + $r = q("SELECT distinct item.id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan WHERE item.uid = %d AND item.item_restrict = 0 AND item.parent = item.id diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index db72eee6a..23a0150c5 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,3 +1,4 @@ +<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel"> <a name="$item.id" ></a> <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > @@ -58,5 +59,5 @@ <div class="wall-item-outside-wrapper-end $item.indent" ></div> </div> - +</div> |