X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdefaults.config.php;h=0d25a1751a47db971d4fde0256757d12ac510ff1;hb=b0d8136b008d17bf9e3579338633c8e3abcfdced;hp=e11e4c5c8d09170a924d385d7b5f54ae5adafd01;hpb=122ad0af14f046c2462a03fe33967dc41abfc8b5;p=friendica.git

diff --git a/static/defaults.config.php b/static/defaults.config.php
index e11e4c5c8d..0d25a1751a 100644
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -56,7 +56,7 @@ return [
 		// pdo_emulate_prepares (Boolean)
 		// If enabled, the builtin emulation for prepared statements is used.
 		// This can be used as a workaround for the database error "Prepared statement needs to be re-prepared".
-		'pdo_emulate_prepares' => false,
+		'pdo_emulate_prepares' => true,
 
 		// disable_pdo (Boolean)
 		// PDO is used by default (if available). Otherwise MySQLi will be used.
@@ -121,6 +121,10 @@ return [
 		// Deny public access to the local user directory.
 		'block_local_dir' => false,
 
+		// blocked_tags (String)
+		// Comma separated list of hash tags that shouldn't be displayed in the trending tags
+		'blocked_tags' => '',
+
 		// community_no_sharer (Boolean)
 		// Don't display sharing accounts on the global community
 		'community_no_sharer' => false,
@@ -405,10 +409,6 @@ return [
 		// Don't show smilies.
 		'no_smilies' => false,
 
-		// optimize_items (Boolean)
-		// Triggers an SQL command to optimize the item table before expiring items.
-		'optimize_items' => false,
-
 		// paranoia (Boolean)
 		// Log out users if their IP address changed.
 		'paranoia' => false,
@@ -429,10 +429,6 @@ return [
 		// Enable internal timings to help optimize code. Needed for "rendertime" addon.
 		'profiler' => false,
 
-		// proxy_cache_time (Integer)
-		// Period in seconds after which the cache is cleared.
-		'proxy_cache_time' => 86400,
-
 		// pushpoll_frequency (Integer)
 		// Frequency of contact poll for subhub contact using the DFRM or OStatus network.
 		// Available values:
@@ -568,7 +564,7 @@ return [
 		'worker_defer_limit' => 15,
 
 		// xrd_timeout (Integer)
-		// Timeout in seconds for fetching the XRD links.
+		// Timeout in seconds for fetching the XRD links and other requests with an expected shorter timeout
 		'xrd_timeout' => 20,
 	],
 	'experimental' => [