mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 17:35:12 +00:00
Merge branch 'dev' of /home/macgirvin/unfediverse.com into dev
This commit is contained in:
commit
82ba3fad78
3 changed files with 2 additions and 1 deletions
|
@ -81,6 +81,7 @@ class Manage extends Controller
|
|||
$channels[$x]['default_links'] = '1';
|
||||
$channels[$x]['collections_label'] = t('Collection');
|
||||
$channels[$x]['forum_label'] = t('Group');
|
||||
$channels[$x]['msg_system'] = t('System | Site Channel');
|
||||
|
||||
$c = q(
|
||||
"SELECT id, item_wall FROM item
|
||||
|
|
|
@ -163,7 +163,6 @@ class Pubstream extends Controller
|
|||
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
|
||||
}
|
||||
|
||||
require_once('include/channel.php');
|
||||
require_once('include/security.php');
|
||||
|
||||
if ($public_stream_mode === PUBLIC_STREAM_SITE) {
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
|
||||
{{$channel.channel_name}}
|
||||
{{if $selected != $channel.channel_id}}</a>{{/if}}
|
||||
{{if $channel.channel_system}} <span class="descriptive-text">{{$channel.msg_system}}</span>{{/if}}
|
||||
</h3>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue