dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cache the title text of an article when there is different ways of presenting the...
[lhc/web/wiklou.git]
/
includes
/
DefaultSettings.php
diff --git
a/includes/DefaultSettings.php
b/includes/DefaultSettings.php
index
dd20e8a
..
004cc5e
100644
(file)
--- a/
includes/DefaultSettings.php
+++ b/
includes/DefaultSettings.php
@@
-31,8
+31,11
@@
if( isset( $_SERVER['SERVER_NAME'] ) ) {
$wgServerName = $_SERVER['SERVER_NAME'];
} elseif( isset( $_SERVER['HOSTNAME'] ) ) {
$wgServerName = $_SERVER['HOSTNAME'];
$wgServerName = $_SERVER['SERVER_NAME'];
} elseif( isset( $_SERVER['HOSTNAME'] ) ) {
$wgServerName = $_SERVER['HOSTNAME'];
+} elseif( isset( $_SERVER['HTTP_HOST'] ) ) {
+ $wgServerName = $_SERVER['HTTP_HOST'];
+} elseif( isset( $_SERVER['SERVER_ADDR'] ) ) {
+ $wgServerName = $_SERVER['SERVER_ADDR'];
} else {
} else {
- # FIXME: Fall back on... something else?
$wgServerName = 'localhost';
}
$wgServerName = 'localhost';
}
@@
-102,6
+105,11
@@
$wgTmpDirectory = "{$wgUploadDirectory}/tmp";
$wgUploadBaseUrl = "";
/**#@-*/
$wgUploadBaseUrl = "";
/**#@-*/
+/**
+ * Produce hashed HTML article paths. Used internally, do not set.
+ */
+$wgMakeDumpLinks = false;
+
/**
* To set 'pretty' URL paths for actions other than
* plain page views, add to this array. For instance:
/**
* To set 'pretty' URL paths for actions other than
* plain page views, add to this array. For instance:
@@
-342,12
+350,9
@@
$wgLanguageFile = false;
/** Treat language links as magic connectors, not inline links */
$wgInterwikiMagic = true;
/** Treat language links as magic connectors, not inline links */
$wgInterwikiMagic = true;
-/** LanguageUtf8.php normally overrides this */
-$wgInputEncoding = 'ISO-8859-1';
-/** unless you set the next option to true: */
-$wgOutputEncoding = 'ISO-8859-1';
-/** Enable ISO-8859-1 compatibility mode */
-$wgUseLatin1 = false;
+/** We speak UTF-8 all the time now, unless some oddities happen */
+$wgInputEncoding = 'UTF-8';
+$wgOutputEncoding = 'UTF-8';
$wgEditEncoding = '';
# Set this to eg 'ISO-8859-1' to perform character set
$wgEditEncoding = '';
# Set this to eg 'ISO-8859-1' to perform character set
@@
-367,7
+372,9
@@
$wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd';
/** Enable to allow rewriting dates in page text.
* DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES */
$wgUseDynamicDates = false;
/** Enable to allow rewriting dates in page text.
* DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES */
$wgUseDynamicDates = false;
-/** Enable for English module to print dates as eg 'May 12' instead of '12 May' */
+/** Enable dates like 'May 12' instead of '12 May', this only takes effect if
+ * the interface is set to English
+ */
$wgAmericanDates = false;
/**
* For Hindi and Arabic use local numerals instead of Western style (0-9)
$wgAmericanDates = false;
/**
* For Hindi and Arabic use local numerals instead of Western style (0-9)
@@
-511,8
+518,8
@@
$wgWhitelistAccount = array ( 'user' => 1, 'sysop' => 1, 'developer' => 1 );
$wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'minor'
$wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'minor'
-$wgSysopUserBans =
fals
e; # Allow sysops to ban logged-in users
-$wgSysopRangeBans =
fals
e; # Allow sysops to ban IP ranges
+$wgSysopUserBans =
tru
e; # Allow sysops to ban logged-in users
+$wgSysopRangeBans =
tru
e; # Allow sysops to ban IP ranges
/** Comma-separated list of options to show on the IP block form.
* Use strtotime() format, or "infinite" for an infinite block
/** Comma-separated list of options to show on the IP block form.
* Use strtotime() format, or "infinite" for an infinite block
@@
-657,6
+664,10
@@
$wgSquidServersNoPurge = array();
/** Maximum number of titles to purge in any one client operation */
$wgMaxSquidPurgeTitles = 400;
/** Maximum number of titles to purge in any one client operation */
$wgMaxSquidPurgeTitles = 400;
+/** HTCP multicast purging */
+$wgHTCPPort = 4827;
+$wgHTCPMulticastTTL = 1;
+# $wgHTCPMulticastAddress = "224.0.0.85";
# Cookie settings:
#
# Cookie settings:
#
@@
-722,7
+733,7
@@
$wgDisableTextSearch = false;
*/
$wgDisableSearchUpdate = false;
/** Uploads have to be specially set up to be secure */
*/
$wgDisableSearchUpdate = false;
/** Uploads have to be specially set up to be secure */
-$wg
DisableUploads = tru
e;
+$wg
EnableUploads = fals
e;
/**
* Set to true to enable the upload _link_ while local uploads are disabled.
* Assumes that the special page link will be bounced to another server where
/**
* Set to true to enable the upload _link_ while local uploads are disabled.
* Assumes that the special page link will be bounced to another server where
@@
-772,7
+783,7
@@
$wgCheckFileExtensions = true;
$wgStrictFileExtensions = true;
/** Warn if uploaded files are larger than this */
$wgStrictFileExtensions = true;
/** Warn if uploaded files are larger than this */
-$wgUploadSizeWarning = 150
000
;
+$wgUploadSizeWarning = 150
* 1024
;
/** For compatibility with old installations set to false */
$wgPasswordSalt = true;
/** For compatibility with old installations set to false */
$wgPasswordSalt = true;
@@
-1210,6
+1221,16
@@
$wgUseExternalEditor = true;
$wgSortSpecialPages = true;
$wgSortSpecialPages = true;
+/**
+ * Array of disabled article actions, e.g. view, edit, dublincore, delete, etc.
+ */
+$wgDisabledActions = array();
+
+/**
+ * Use http.dnsbl.sorbs.net to check for open proxies
+ */
+$wgEnableSorbs = true;
+
} else {
die();
}
} else {
die();
}