Merge "Make $wgDBerrorLogTZ actually default to $wgLocaltimezone"

diff --combined includes/DefaultSettings.php
index 1a3fbbf,0d56aa5..51e807c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1587,15 -1587,6 +1587,15 @@@ $wgEnotifMaxRecips = 500
   */
  $wgEnotifUseJobQ = false;
  
 +/**
 + * Use the job queue for user activity updates like updating "last visited"
 + * fields for email notifications of page changes. This should only be enabled
 + * if the jobs have a dedicated runner to avoid update lag.
 + *
 + * @since 1.26
 + */
 +$wgActivityUpdatesUseJobQueue = false;
 +
  /**
   * Use real name instead of username in e-mail "from" field.
   */
@@@ -1853,11 -1844,11 +1853,11 @@@ $wgDBerrorLog = false
   *
   * @par Examples:
   * @code
-  * $wgLocaltimezone = 'UTC';
-  * $wgLocaltimezone = 'GMT';
-  * $wgLocaltimezone = 'PST8PDT';
-  * $wgLocaltimezone = 'Europe/Sweden';
-  * $wgLocaltimezone = 'CET';
+  * $wgDBerrorLogTZ = 'UTC';
+  * $wgDBerrorLogTZ = 'GMT';
+  * $wgDBerrorLogTZ = 'PST8PDT';
+  * $wgDBerrorLogTZ = 'Europe/Sweden';
+  * $wgDBerrorLogTZ = 'CET';
   * @endcode
   *
   * @since 1.20
@@@ -6493,7 -6484,6 +6493,7 @@@ $wgJobClasses = array
        'ThumbnailRender' => 'ThumbnailRenderJob',
        'recentChangesUpdate' => 'RecentChangesUpdateJob',
        'refreshLinksPrioritized' => 'RefreshLinksJob', // for cascading protection
 +      'activityUpdateJob' => 'ActivityUpdateJob',
        'enqueue' => 'EnqueueJob', // local queue for multi-DC setups
        'null' => 'NullJob'
  );