Merge "Fix Postgres support"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f7f52e5..9436aa6 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6765,7 +6765,7 @@ $wgUseRCPatrol = true;
 /**
  * Whether to allow users to save their RecentChanges filters
  */
-$wgStructuredChangeFiltersEnableSaving = false;
+$wgStructuredChangeFiltersEnableSaving = true;
 
 /**
  * Use new page patrolling to check new pages on Special:Newpages
@@ -8559,6 +8559,15 @@ $wgPopularPasswordFile = __DIR__ . '/../serialized/commonpasswords.cdb';
  */
 $wgMaxUserDBWriteDuration = false;
 
+/*
+ * Max time (in seconds) a job-generated transaction can spend in writes.
+ * If exceeded, the transaction is rolled back with an error instead of being committed.
+ *
+ * @var int|bool Disabled if false
+ * @since 1.30
+ */
+$wgMaxJobDBWriteDuration = false;
+
 /**
  * Mapping of event channels (or channel categories) to EventRelayer configuration.
  *