Merge "Split mediawiki.toolbar from mediawiki.action.edit"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ea2242f..c6e91cf 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1249,7 +1249,7 @@ $wgThumbnailMinimumBucketDistance = 50;
  *
  * This obviously means that more disk space is needed per upload upfront.
  *
- * @since 1.24
+ * @since 1.25
  */
 
 $wgUploadThumbnailRenderMap = array();
@@ -1263,14 +1263,14 @@ $wgUploadThumbnailRenderMap = array();
  * This method only works if thumbnails are configured to be rendered by a 404 handler. The latter
  * option uses the job queue to render the thumbnail.
  *
- * @since 1.24
+ * @since 1.25
  */
 $wgUploadThumbnailRenderMethod = 'jobqueue';
 
 /**
  * When using the "http" wgUploadThumbnailRenderMethod, lets one specify a custom Host HTTP header.
  *
- * @since 1.24
+ * @since 1.25
  */
 $wgUploadThumbnailRenderHttpCustomHost = false;
 
@@ -1278,7 +1278,7 @@ $wgUploadThumbnailRenderHttpCustomHost = false;
  * When using the "http" wgUploadThumbnailRenderMethod, lets one specify a custom domain to send the
  * HTTP request to.
  *
- * @since 1.24
+ * @since 1.25
  */
 $wgUploadThumbnailRenderHttpCustomDomain = false;
 
@@ -5626,11 +5626,6 @@ $wgPreviewOnOpenNamespaces = array(
        NS_CATEGORY => true
 );
 
-/**
- * Go button goes straight to the edit screen if the article doesn't exist.
- */
-$wgGoToEdit = false;
-
 /**
  * Enable the UniversalEditButton for browsers that support it
  * (currently only Firefox with an extension)
@@ -5885,11 +5880,6 @@ $wgAdvertisedFeedTypes = array( 'atom' );
  */
 $wgRCShowWatchingUsers = false; # UPO
 
-/**
- * Show watching users in Page views
- */
-$wgPageShowWatchingUsers = false;
-
 /**
  * Show the amount of changed characters in recent changes
  */
@@ -7093,6 +7083,18 @@ $wgAsyncHTTPTimeout = 25;
  */
 $wgHTTPProxy = false;
 
+/**
+ * Local virtual hosts.
+ *
+ * This lists domains that are configured as virtual hosts on the same machine.
+ * If a request is to be made to a domain listed here, or any subdomain thereof,
+ * then no proxy will be used.
+ * Command-line scripts are not affected by this setting and will always use
+ * proxy if it is configured.
+ * @since 1.25
+ */
+$wgLocalVirtualHosts = array();
+
 /**
  * Timeout for connections done internally (in seconds)
  * Only works for curl