Merge "Set $wgContentHandlerUseDB to false by default for now"

diff --combined includes/DefaultSettings.php
index 6dde841,563bfb4..05dc1d3
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -530,13 -530,6 +530,13 @@@ $wgAllowAsyncCopyUploads = false
   */
  $wgCopyUploadsDomains = array();
  
 +/**
 + * Enable copy uploads from Special:Upload. $wgAllowCopyUploads must also be
 + * true. If $wgAllowCopyUploads is true, but this is false, you will only be
 + * able to perform copy uploads from the API or extensions (e.g. UploadWizard).
 + */
 +$wgCopyUploadsFromSpecialUpload = false;
 +
  /**
   * Proxy to use for copy upload requests.
   * @since 1.20
@@@ -6322,7 -6315,7 +6322,7 @@@ $wgContentHandlerTextFallback = 'ignore
   *
   * @since 1.21
   */
- $wgContentHandlerUseDB = true;
+ $wgContentHandlerUseDB = false;
  
  /**
   * Whether the user must enter their password to change their e-mail address