Merge pull request #10492 from annando/simple-short

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index e11e4c5c8d09170a924d385d7b5f54ae5adafd01..20f351ab0eb66abec63cbc69af9c3f8519f039ae 100644 (file)
--- 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,