diff options
| author | friendica <info@friendica.com> | 2014-09-30 21:31:31 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-30 21:31:31 -0700 |
| commit | 79f1d48e194f9989f5b76168496a444d0af1e36e (patch) | |
| tree | 6ace96ec6d15986a3177b0ec926c0e4a7195b802 | |
| parent | cb44d015f3c3b0f0a8835d4391d5cea0041d1eed (diff) | |
| parent | e12872fdaebeba83483bae217425118b3b6b65d3 (diff) | |
| download | volse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.tar.gz volse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.tar.bz2 volse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rwxr-xr-x | .gitignore | 6 | ||||
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | mod/siteinfo.php | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 80fe3ec72..df7ca3549 100755 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,9 @@ nbproject #Kdevelop project files *.kdev4 + +# Ignore site TOS +doc/SiteTOS.md + +#Ingore site theme schemas +view/theme/redbasic/schema/default.php diff --git a/include/conversation.php b/include/conversation.php index b0a388a68..92ba18d13 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1341,8 +1341,10 @@ function prepare_page($item) { // the template will get passed an unobscured title. $body = prepare_body($item,true); - - return replace_macros(get_markup_template('page_display.tpl'),array( + $tpl = get_pconfig($item['uid'],'system','pagetemplate'); + if (! $tpl) + $tpl = 'page_display.tpl'; + return replace_macros(get_markup_template($tpl),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), '$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])), '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 4568906f3..eab52e41e 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -4,7 +4,8 @@ function siteinfo_init(&$a) { if ($a->argv[1]=="json"){ $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 = ''; $r = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) and account_default_channel = channel_id"); @@ -100,6 +101,7 @@ function siteinfo_init(&$a) { 'url' => z_root(), 'plugins' => $visible_plugins, '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'), 'rss_connections' => get_config('system','feed_contacts'), 'default_service_restrictions' => $service_class, |