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
Merge "Add isCurrentWikiId()/isCurrentWikiDomain()/getCurrentWikiDomain() to WikiMap"
[lhc/web/wiklou.git]
/
includes
/
DefaultSettings.php
diff --git
a/includes/DefaultSettings.php
b/includes/DefaultSettings.php
index
fa95633
..
82dbecf
100644
(file)
--- a/
includes/DefaultSettings.php
+++ b/
includes/DefaultSettings.php
@@
-2999,8
+2999,11
@@
$wgExtraLanguageNames = [];
* @since 1.29
*/
$wgExtraLanguageCodes = [
* @since 1.29
*/
$wgExtraLanguageCodes = [
+ // Language codes of macro languages, which get mapped to the main language
'bh' => 'bho', // Bihari language family
'no' => 'nb', // Norwegian language family
'bh' => 'bho', // Bihari language family
'no' => 'nb', // Norwegian language family
+
+ // Language variants which get mapped to the main language
'simple' => 'en', // Simple English
];
'simple' => 'en', // Simple English
];
@@
-3019,6
+3022,8
@@
$wgDummyLanguageCodes = [];
*
* Note that pages with titles containing presentation forms will become
* inaccessible, run maintenance/cleanupTitles.php to fix this.
*
* Note that pages with titles containing presentation forms will become
* inaccessible, run maintenance/cleanupTitles.php to fix this.
+ *
+ * @deprecated since 1.33: in the future will always be true.
*/
$wgFixArabicUnicode = true;
*/
$wgFixArabicUnicode = true;
@@
-3030,6
+3035,8
@@
$wgFixArabicUnicode = true;
*
* If you enable this on an existing wiki, run maintenance/cleanupTitles.php to
* fix any ZWJ sequences in existing page titles.
*
* If you enable this on an existing wiki, run maintenance/cleanupTitles.php to
* fix any ZWJ sequences in existing page titles.
+ *
+ * @deprecated since 1.33: in the future will always be true.
*/
$wgFixMalayalamUnicode = true;
*/
$wgFixMalayalamUnicode = true;
@@
-4238,8
+4245,10
@@
$wgAllowExternalImagesFrom = '';
*
* Set this to true to enable the on-wiki whitelist (MediaWiki:External image whitelist)
* Or false to disable it
*
* Set this to true to enable the on-wiki whitelist (MediaWiki:External image whitelist)
* Or false to disable it
+ *
+ * @since 1.14
*/
*/
-$wgEnableImageWhitelist =
tru
e;
+$wgEnableImageWhitelist =
fals
e;
/**
* A different approach to the above: simply allow the "<img>" tag to be used.
/**
* A different approach to the above: simply allow the "<img>" tag to be used.
@@
-4564,10
+4573,6
@@
$wgAuthManagerConfig = null;
*/
$wgAuthManagerAutoConfig = [
'preauth' => [
*/
$wgAuthManagerAutoConfig = [
'preauth' => [
- MediaWiki\Auth\LegacyHookPreAuthenticationProvider::class => [
- 'class' => MediaWiki\Auth\LegacyHookPreAuthenticationProvider::class,
- 'sort' => 0,
- ],
MediaWiki\Auth\ThrottlePreAuthenticationProvider::class => [
'class' => MediaWiki\Auth\ThrottlePreAuthenticationProvider::class,
'sort' => 0,
MediaWiki\Auth\ThrottlePreAuthenticationProvider::class => [
'class' => MediaWiki\Auth\ThrottlePreAuthenticationProvider::class,
'sort' => 0,
@@
-4884,7
+4889,6
@@
$wgDefaultUserOptions = [
'rows' => 25, // @deprecated since 1.29 No longer used in core
'showhiddencats' => 0,
'shownumberswatching' => 1,
'rows' => 25, // @deprecated since 1.29 No longer used in core
'showhiddencats' => 0,
'shownumberswatching' => 1,
- 'showtoolbar' => 1,
'skin' => false,
'stubthreshold' => 0,
'thumbsize' => 5,
'skin' => false,
'stubthreshold' => 0,
'thumbsize' => 5,
@@
-9024,6
+9028,16
@@
$wgChangeTagsSchemaMigrationStage = MIGRATION_WRITE_BOTH;
*/
$wgTagStatisticsNewTable = false;
*/
$wgTagStatisticsNewTable = false;
+/**
+ * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages
+ * or namespaces.
+ *
+ * @since 1.32
+ * @deprecated 1.32
+ * @var bool
+ */
+$wgEnablePartialBlocks = false;
+
/**
* For really cool vim folding this needs to be at the end:
* vim: foldmarker=@{,@} foldmethod=marker
/**
* For really cool vim folding this needs to be at the end:
* vim: foldmarker=@{,@} foldmethod=marker