From bc61093c5a335b193a3f35ef0345beb39d3e5548 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Fri, 26 Jul 2013 14:30:33 +0200 Subject: [PATCH] Fix documentation of $wgTranscludeCacheExpiry Fix for 937fc3b (SVN r98467)... Also improve the one of $wgEnableScaryTranscluding while I'm at it. Bug: 52006 Change-Id: Ia84c826f4f4d8fa18d3bf36f732e5b487544caa2 --- RELEASE-NOTES-1.22 | 1 + includes/DefaultSettings.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index d6204a7632..64d970eee0 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -229,6 +229,7 @@ production. (jquery.makeCollapsible, jquery.tablesorter) after preview content is loaded. * (bug 51891) Fixed PHP notice on Special:PagesWithProp when no properties are defined. +* (bug 52006) Corrected documentation of $wgTranscludeCacheExpiry. === API changes in 1.22 === * (bug 25553) The JSON output formatter now leaves forward slashes unescaped diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 15f6987939..86b08498fd 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3516,12 +3516,13 @@ $wgExpensiveParserFunctionLimit = 100; $wgPreprocessorCacheThreshold = 1000; /** - * Enable interwiki transcluding. Only when iw_trans=1. + * Enable interwiki transcluding. Only when iw_trans=1 in the interwiki table. */ $wgEnableScaryTranscluding = false; /** - * (see next option $wgGlobalDatabase). + * Expiry time for transcluded templates cached in transcache database table. + * Only used $wgEnableInterwikiTranscluding is set to true. */ $wgTranscludeCacheExpiry = 3600; -- 2.20.1