bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1704-mastodon

Browse source 
Conflicts:
	include/bbcode.php
This commit is contained in:
Michael 2017-04-20 05:44:31 +00:00
commit 3592f90910
83 changed files with 2859 additions and 2177 deletions
Download patch file Download diff file Expand all files Collapse all files

1
view/templates/admin_site.tpl
View file

@ -138,7 +138,6 @@
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
<h3>{{$performance}}</h3>
<!-- {{include file="field_checkbox.tpl" field=$use_fulltext_engine}} -->
{{include file="field_checkbox.tpl" field=$only_tag_search}}
{{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}}

2
view/templates/htconfig.tpl
View file

@ -15,7 +15,7 @@ $db_user = '{{$dbuser}}';
$db_pass = '{{$dbpass}}';
$db_data = '{{$dbdata}}';
// Set the database connection charset to UTF8.
// Set the database connection charset to full Unicode (utf8mb4).
// Changing this value will likely corrupt the special characters.
// You have been warned.
$a->config['system']['db_charset'] = "utf8mb4";