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 "mw.widgets.visibleLengthLimit: Do not show countdown until last 99 characters"
[lhc/web/wiklou.git]
/
includes
/
parser
/
ParserCache.php
diff --git
a/includes/parser/ParserCache.php
b/includes/parser/ParserCache.php
index
c680129
..
e6326e6
100644
(file)
--- a/
includes/parser/ParserCache.php
+++ b/
includes/parser/ParserCache.php
@@
-253,11
+253,6
@@
class ParserCache {
wfDebug( "ParserOutput cache found.\n" );
wfDebug( "ParserOutput cache found.\n" );
- // The edit section preference may not be the appropiate one in
- // the ParserOutput, as we are not storing it in the parsercache
- // key. Force it here. See T33445.
- $value->setEditSectionTokens( $popts->getEditSection() );
-
$wikiPage = method_exists( $article, 'getPage' )
? $article->getPage()
: $article;
$wikiPage = method_exists( $article, 'getPage' )
? $article->getPage()
: $article;
@@
-296,8
+291,8
@@
class ParserCache {
* @param ParserOutput $parserOutput
* @param WikiPage $page
* @param ParserOptions $popts
* @param ParserOutput $parserOutput
* @param WikiPage $page
* @param ParserOptions $popts
- * @param string
$cacheTime Time
when the cache was generated
- * @param int $revId Revision ID that was parsed
+ * @param string
|null $cacheTime TS_MW timestamp
when the cache was generated
+ * @param int
|null
$revId Revision ID that was parsed
*/
public function save( $parserOutput, $page, $popts, $cacheTime = null, $revId = null ) {
$expire = $parserOutput->getCacheExpiry();
*/
public function save( $parserOutput, $page, $popts, $cacheTime = null, $revId = null ) {
$expire = $parserOutput->getCacheExpiry();