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 "Fix Postgres support"
[lhc/web/wiklou.git]
/
includes
/
page
/
WikiPage.php
diff --git
a/includes/page/WikiPage.php
b/includes/page/WikiPage.php
index
a687900
..
0e23a88
100644
(file)
--- a/
includes/page/WikiPage.php
+++ b/
includes/page/WikiPage.php
@@
-1055,6
+1055,13
@@
class WikiPage implements Page, IDBAccessObject {
) {
$useParserCache =
( !$forceParse ) && $this->shouldCheckParserCache( $parserOptions, $oldid );
) {
$useParserCache =
( !$forceParse ) && $this->shouldCheckParserCache( $parserOptions, $oldid );
+
+ if ( $useParserCache && !$parserOptions->isSafeToCache() ) {
+ throw new InvalidArgumentException(
+ 'The supplied ParserOptions are not safe to cache. Fix the options or set $forceParse = true.'
+ );
+ }
+
wfDebug( __METHOD__ .
': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
if ( $parserOptions->getStubThreshold() ) {
wfDebug( __METHOD__ .
': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
if ( $parserOptions->getStubThreshold() ) {
@@
-1177,7
+1184,7
@@
class WikiPage implements Page, IDBAccessObject {
);
if ( $dbw->affectedRows() > 0 ) {
);
if ( $dbw->affectedRows() > 0 ) {
- $newid = $pageId ?: $dbw->insertId();
+ $newid = $pageId ?
(int)$pageId
: $dbw->insertId();
$this->mId = $newid;
$this->mTitle->resetArticleID( $newid );
$this->mId = $newid;
$this->mTitle->resetArticleID( $newid );
@@
-2901,8
+2908,8
@@
class WikiPage implements Page, IDBAccessObject {
$status->value = $logid;
// Show log excerpt on 404 pages rather than just a link
$status->value = $logid;
// Show log excerpt on 404 pages rather than just a link
- $cache =
ObjectCache::getMainStashInstance
();
- $key =
wfMemc
Key( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
+ $cache =
MediaWikiServices::getInstance()->getMainObjectStash
();
+ $key =
$cache->make
Key( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
$cache->set( $key, 1, $cache::TTL_DAY );
return $status;
$cache->set( $key, 1, $cache::TTL_DAY );
return $status;
@@
-3496,7
+3503,10
@@
class WikiPage implements Page, IDBAccessObject {
);
foreach ( $rows as $row ) {
$cat = Category::newFromRow( $row );
);
foreach ( $rows as $row ) {
$cat = Category::newFromRow( $row );
- $cat->refreshCounts();
+ // T166757: do the update after this DB commit
+ DeferredUpdates::addCallableUpdate( function () use ( $cat ) {
+ $cat->refreshCounts();
+ } );
}
}
}
}
}
}