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 "ParserCache: Don't try to save to nothing if disabled"
[lhc/web/wiklou.git]
/
includes
/
parser
/
ParserCache.php
diff --git
a/includes/parser/ParserCache.php
b/includes/parser/ParserCache.php
index
21486ff
..
c6265a7
100644
(file)
--- a/
includes/parser/ParserCache.php
+++ b/
includes/parser/ParserCache.php
@@
-262,7
+262,7
@@
class ParserCache {
*/
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();
- if ( $expire > 0 ) {
+ if ( $expire > 0
&& !$this->mMemc instanceof EmptyBagOStuff
) {
$cacheTime = $cacheTime ?: wfTimestampNow();
if ( !$revId ) {
$revision = $page->getRevision();
$cacheTime = $cacheTime ?: wfTimestampNow();
if ( !$revId ) {
$revision = $page->getRevision();
@@
-302,7
+302,7
@@
class ParserCache {
'ParserCacheSaveComplete',
[ $this, $parserOutput, $page->getTitle(), $popts, $revId ]
);
'ParserCacheSaveComplete',
[ $this, $parserOutput, $page->getTitle(), $popts, $revId ]
);
- } else {
+ } else
if ( $expire <= 0 )
{
wfDebug( "Parser output was marked as uncacheable and has not been saved.\n" );
}
}
wfDebug( "Parser output was marked as uncacheable and has not been saved.\n" );
}
}