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 "ApiLogin: Don't try to add block info if there's no block"
[lhc/web/wiklou.git]
/
includes
/
DefaultSettings.php
diff --git
a/includes/DefaultSettings.php
b/includes/DefaultSettings.php
index
c757b10
..
f0450a9
100644
(file)
--- a/
includes/DefaultSettings.php
+++ b/
includes/DefaultSettings.php
@@
-211,7
+211,7
@@
$wgLoadScript = false;
/**
* The URL path of the skins directory.
/**
* The URL path of the skins directory.
- * Defaults to "{$wg
Script
Path}/skins".
+ * Defaults to "{$wg
ResourceBase
Path}/skins".
* @since 1.3
*/
$wgStylePath = false;
* @since 1.3
*/
$wgStylePath = false;
@@
-226,7
+226,7
@@
$wgLocalStylePath = false;
/**
* The URL path of the extensions directory.
/**
* The URL path of the extensions directory.
- * Defaults to "{$wg
Script
Path}/extensions".
+ * Defaults to "{$wg
ResourceBase
Path}/extensions".
* @since 1.16
*/
$wgExtensionAssetsPath = false;
* @since 1.16
*/
$wgExtensionAssetsPath = false;
@@
-1860,12
+1860,6
@@
$wgDBservers = false;
*/
$wgLBFactoryConf = array( 'class' => 'LBFactorySimple' );
*/
$wgLBFactoryConf = array( 'class' => 'LBFactorySimple' );
-/**
- * How long to wait for a slave to catch up to the master
- * @deprecated since 1.24
- */
-$wgMasterWaitTimeout = 10;
-
/**
* File to log database errors to
*/
/**
* File to log database errors to
*/
@@
-3479,8
+3473,8
@@
$wgResourceModuleSkinStyles = array();
$wgResourceLoaderSources = array();
/**
$wgResourceLoaderSources = array();
/**
- *
D
efault 'remoteBasePath' value for instances of ResourceLoaderFileModule.
- *
If not set, then $wgScriptPath will be used as a fallback
.
+ *
The d
efault 'remoteBasePath' value for instances of ResourceLoaderFileModule.
+ *
Defaults to $wgScriptPath
.
*/
$wgResourceBasePath = null;
*/
$wgResourceBasePath = null;
@@
-3617,13
+3611,6
@@
$wgResourceLoaderValidateJS = true;
*/
$wgResourceLoaderValidateStaticJS = false;
*/
$wgResourceLoaderValidateStaticJS = false;
-/**
- * If set to true, asynchronous loading of bottom-queue scripts in the "<head>"
- * will be enabled. This is an experimental feature that's supposed to make
- * JavaScript load faster.
- */
-$wgResourceLoaderExperimentalAsyncLoading = false;
-
/**
* Global LESS variables. An associative array binding variable names to
* LESS code snippets representing their values.
/**
* Global LESS variables. An associative array binding variable names to
* LESS code snippets representing their values.
@@
-3733,8
+3720,8
@@
$wgMetaNamespaceTalk = false;
* Additional namespaces. If the namespaces defined in Language.php and
* Namespace.php are insufficient, you can create new ones here, for example,
* to import Help files in other languages. You can also override the namespace
* Additional namespaces. If the namespaces defined in Language.php and
* Namespace.php are insufficient, you can create new ones here, for example,
* to import Help files in other languages. You can also override the namespace
- * names of existing namespaces. Extensions
developers should use
- *
$wgCanonicalNamespaceNames
.
+ * names of existing namespaces. Extensions
should use the CanonicalNamespaces
+ *
hook or extension.json
.
*
* @warning Once you delete a namespace, the pages in that namespace will
* no longer be accessible. If you rename it, then you can access them through
*
* @warning Once you delete a namespace, the pages in that namespace will
* no longer be accessible. If you rename it, then you can access them through
@@
-7706,6
+7693,7
@@
$wgUseLinkNamespaceDBFields = true;
* $wgVirtualRestConfig['modules']['parsoid'] = array(
* 'url' => 'http://localhost:8000',
* 'prefix' => 'enwiki',
* $wgVirtualRestConfig['modules']['parsoid'] = array(
* 'url' => 'http://localhost:8000',
* 'prefix' => 'enwiki',
+ * 'domain' => 'en.wikipedia.org',
* );
*
* @var array
* );
*
* @var array
@@
-7716,6
+7704,7
@@
$wgVirtualRestConfig = array(
'global' => array(
# Timeout in seconds
'timeout' => 360,
'global' => array(
# Timeout in seconds
'timeout' => 360,
+ # 'domain' is set to $wgCanonicalServer in Setup.php
'forwardCookies' => false,
'HTTPProxy' => null
)
'forwardCookies' => false,
'HTTPProxy' => null
)