Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 10:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/friendica/red into pending_merge

Browse source
This commit is contained in:
friendica 2014-09-30 21:31:31 -07:00
commit 79f1d48e19
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -41,3 +41,9 @@ nbproject
#Kdevelop project files #Kdevelop project files
*.kdev4 *.kdev4
# Ignore site TOS
doc/SiteTOS.md
#Ingore site theme schemas
view/theme/redbasic/schema/default.php

6
include/conversation.php
View file

@ -1341,8 +1341,10 @@ function prepare_page($item) {
// the template will get passed an unobscured title. // the template will get passed an unobscured title.
$body = prepare_body($item,true); $body = prepare_body($item,true);
$tpl = get_pconfig($item['uid'],'system','pagetemplate');
return replace_macros(get_markup_template('page_display.tpl'),array( if (! $tpl)
$tpl = 'page_display.tpl';
return replace_macros(get_markup_template($tpl),array(
'$author' => (($naked) ? '' : $item['author']['xchan_name']), '$author' => (($naked) ? '' : $item['author']['xchan_name']),
'$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])), '$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])),
'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),

2
mod/siteinfo.php
View file

@ -4,6 +4,7 @@ function siteinfo_init(&$a) {
if ($a->argv[1]=="json"){ if ($a->argv[1]=="json"){
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
$directory_mode = Array('DIRECTORY_MODE_NORMAL', 'DIRECTORY_MODE_SECONDARY','DIRECTORY_MODE_PRIMARY', 'DIRECTORY_MODE_STANDALONE');
$sql_extra = ''; $sql_extra = '';
@ -100,6 +101,7 @@ function siteinfo_init(&$a) {
'url' => z_root(), 'url' => z_root(),
'plugins' => $visible_plugins, 'plugins' => $visible_plugins,
'register_policy' => $register_policy[$a->config['system']['register_policy']], 'register_policy' => $register_policy[$a->config['system']['register_policy']],
'directory_mode' => $directory_mode[$a->config['system']['directory_mode']],
'diaspora_emulation' => get_config('system','diaspora_enabled'), 'diaspora_emulation' => get_config('system','diaspora_enabled'),
'rss_connections' => get_config('system','feed_contacts'), 'rss_connections' => get_config('system','feed_contacts'),
'default_service_restrictions' => $service_class, 'default_service_restrictions' => $service_class,