(bug 18885) Red links for media files do not support shared repositories

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c559897..ed4f047 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -472,6 +472,9 @@ $wgMaxUploadSize = 1024*1024*100; # 100MB
  * Useful if you want to use a shared repository by default
  * without disabling local uploads (use $wgEnableUploads = false for that)
  * e.g. $wgUploadNavigationUrl = 'http://commons.wikimedia.org/wiki/Special:Upload';
+ * 
+ * This also affects images inline images that do not exist. In that case the URL will get
+ * (?|&)wpDestFile=<filename> appended to it as appropriate.
  */
 $wgUploadNavigationUrl = false;
 
@@ -907,7 +910,7 @@ $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd';
 $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml';
 
 /**
- * Should we output an HTML 5 doctype?  This mode is still experimental, but
+ * Should we output an HTML5 doctype?  This mode is still experimental, but
  * all indications are that it should be usable, so it's enabled by default.
  * If all goes well, it will be removed and become always true before the 1.16
  * release.
@@ -927,7 +930,7 @@ $wgHtml5Version = null;
 $wgAllowRdfaAttributes = true;
 
 /**
- * Enabled HTML 5 microdata attributes for use in wikitext, if $wgHtml5 is also true.
+ * Enabled HTML5 microdata attributes for use in wikitext, if $wgHtml5 is also true.
  */
 $wgAllowMicrodataAttributes = true;
 
@@ -939,7 +942,7 @@ $wgAllowMicrodataAttributes = true;
  *
  * Setting this to false may omit quotation marks on some attributes, omit
  * slashes from some self-closing tags, omit some ending tags, etc., where
- * permitted by HTML 5.  Setting it to true will not guarantee that all pages
+ * permitted by HTML5.  Setting it to true will not guarantee that all pages
  * will be well-formed, although non-well-formed pages should be rare and it's
  * a bug if you find one.  Conversely, setting it to false doesn't mean that
  * all XML-y constructs will be omitted, just that they might be.
@@ -1621,7 +1624,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '257';
+$wgStyleVersion = '258';
 
 
 # Server-side caching:
@@ -3494,14 +3497,28 @@ $wgDisableHardRedirects = false;
 $wgEnableTooltipsAndAccesskeys = true;
 
 /**
- * Whether to use DNS blacklists in $wgSorbsUrl to check for open proxies
+ * Whether to use DNS blacklists in $wgDnsBlacklistUrls to check for open proxies
+ * @since 1.16
+ */
+$wgEnableDnsBlacklist = false;
+
+/**
+ * @deprecated Use $wgEnableDnsBlacklist instead, only kept for backward
+ *  compatibility
  */
 $wgEnableSorbs = false;
 
 /**
- * List of DNS blacklists to use, if $wgEnableSorbs is true
+ * List of DNS blacklists to use, if $wgEnableDnsBlacklist is true
+ * @since 1.16
  */
-$wgSorbsUrl = array( 'http.dnsbl.sorbs.net.' );
+$wgDnsBlacklistUrls = array( 'http.dnsbl.sorbs.net.' );
+
+/**
+ * @deprecated Use $wgDnsBlacklistUrls instead, only kept for backward
+ *  compatibility
+ */
+$wgSorbsUrl = array();
 
 /**
  * Proxy whitelist, list of addresses that are assumed to be non-proxy despite
@@ -3761,6 +3778,11 @@ $wgMaxShellFileSize = 102400;
  */
 $wgMaxShellTime = 180;
 
+/**
+ * Executable path of the PHP cli binary (php/php5). Should be set up on install.
+ */
+$wgPhpCli = '/usr/bin/php';
+
 /**
  * DJVU settings
  * Path of the djvudump executable