Merge pull request #3326 from Alkarex/utf8mb4

Default to utf8mb4

diff --combined htconfig.php
index b3e4ef9e9b980f79cb254feca2235098887748a4,fe5a17520b4c3f15f942a12045e947f5120035fe..4ea97e9aeb760f659a3d45adb9aa6a04ac5d9a78
--- 1/htconfig.php
--- 2/htconfig.php
+++ b/htconfig.php
@@@ -16,7 -16,7 +16,7 @@@ $db_user = 'mysqlusername'
  $db_pass = 'mysqlpassword';
  $db_data = 'mysqldatabasename';
  
- // 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";
@@@ -87,7 -87,7 +87,7 @@@ $a->config['system']['no_regfullname'] 
  //$a->config['system']['block_local_dir'] = false;
  
  // Location of the global directory
 -$a->config['system']['directory'] = 'http://dir.friendi.ca';
 +$a->config['system']['directory'] = 'https://dir.friendica.social';
  
  // Allowed protocols in link URLs; HTTP protocols always are accepted
  $a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');