diff options
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 05e0ede84..140320a50 100644 --- a/include/items.php +++ b/include/items.php @@ -5416,7 +5416,7 @@ function items_by_parent_ids(array $parents, null|array $thr_parents = null, str $ids = ids_to_querystr($parents, 'item_id'); $thread_allow = ((local_channel()) ? PConfig::Get(local_channel(), 'system', 'thread_allow', true) : Config::Get('system', 'thread_allow', true)); $item_normal_sql = item_normal(); - $limit = 3; + $limit = $thread_allow ? 3 : 1000; $thr_parent_sql = (($thread_allow) ? " AND item.thr_parent = item.parent_mid " : ''); if ($thr_parents && $thread_allow) { diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 675aebeb3..b201a4748 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -219,7 +219,7 @@ </div> </div> {{if $item.thread_level == 1}} - {{if $item.toplevel && $item.load_more && !$item.blog_mode}} + {{if $item.toplevel && $item.load_more && $item.threaded && !$item.blog_mode}} <div id="load-more-progress-wrapper-{{$item.id}}" class="progress " role="progressbar" aria-valuenow="{{$item.comments_total_percent}}" aria-valuemin="0" aria-valuemax="100" style="height: 1px"> <div id="load-more-progress-{{$item.id}}" class="progress-bar bg-info" style="width: {{$item.comments_total_percent}}%; margin-left: auto; margin-right: auto;" data-comments-total="{{$item.comments_total}}"></div> </div> |