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 "Remove support for StartProfiler.php"
[lhc/web/wiklou.git]
/
includes
/
DefaultSettings.php
diff --git
a/includes/DefaultSettings.php
b/includes/DefaultSettings.php
index
ea368bc
..
4ddc23e
100644
(file)
--- a/
includes/DefaultSettings.php
+++ b/
includes/DefaultSettings.php
@@
-4399,7
+4399,7
@@
$wgPreprocessorCacheThreshold = 1000;
$wgEnableScaryTranscluding = false;
/**
$wgEnableScaryTranscluding = false;
/**
- * Expiry time for transcluded templates cached in
transcache database tabl
e.
+ * Expiry time for transcluded templates cached in
object cach
e.
* Only used $wgEnableInterwikiTranscluding is set to true.
*/
$wgTranscludeCacheExpiry = 3600;
* Only used $wgEnableInterwikiTranscluding is set to true.
*/
$wgTranscludeCacheExpiry = 3600;
@@
-6348,8
+6348,6
@@
$wgDeprecationReleaseLimit = false;
* Profiler configuration.
*
* To use a profiler, set $wgProfiler in LocalSetings.php.
* Profiler configuration.
*
* To use a profiler, set $wgProfiler in LocalSetings.php.
- * For backwards-compatibility, it is also allowed to set the variable from
- * a separate file called StartProfiler.php, which MediaWiki will include.
*
* Example:
*
*
* Example:
*