X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdefaults.config.php;h=25a23bf9dd64a9cdcccaf99c2cad6bd677dbb6ca;hb=876b424ae355e1e94ed66abfe539fc4c62b4d091;hp=893f77cbd5d44fd1217a02476a1a40690dd2003d;hpb=f246c3fd28310e882888572cf18ca9bf07079282;p=friendica.git

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 893f77cbd5..25a23bf9dd 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,
@@ -247,10 +251,6 @@ return [
 		// Number of "free" searches when system => permit_crawling is enabled.
 		'free_crawls' => 10,
 
-		// frontend_worker_timeout (Integer)
-		// Value in minutes after we think that a frontend task was killed by the webserver.
-		'frontend_worker_timeout' => 10,
-
 		// groupedit_image_limit (Integer)
 		// Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
 		// This can alternatively be set on a per account basis in the pconfig table.
@@ -409,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,
@@ -574,6 +570,10 @@ return [
 		// xrd_timeout (Integer)
 		// Timeout in seconds for fetching the XRD links.
 		'xrd_timeout' => 20,
+
+		// proxy_file_chmod (Octal Integer like 0640)
+		// If set, defines the files permissions for downloaded files in the /proxy/ directory, default is system-dependent
+		'proxy_file_chmod' => 0,
 	],
 	'experimental' => [
 		// exp_themes (Boolean)