# Don't cache a dirty ParserOutput object
if ( $poolArticleView->getIsDirty() ) {
- $outputPage->setSquidMaxage( 0 );
+ $outputPage->setCdnMaxage( 0 );
$outputPage->addHTML( "<!-- parser cache is expired, " .
"sending anyway due to pool overload-->\n" );
}
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
- $cache = wfGetMainCache();
$rc = false;
if ( !$this->getTitle()->quickUserCan( 'patrol', $user )
}
// Check for cached results
- $key = wfMemcKey( 'NotPatrollablePage', $this->getTitle()->getArticleID() );
+ $key = wfMemcKey( 'unpatrollable-page', $this->getTitle()->getArticleID() );
+ $cache = ObjectCache::getMainWANInstance();
if ( $cache->get( $key ) ) {
return false;
}
'rc_namespace' => $this->getTitle()->getNamespace(),
'rc_cur_id' => $this->getTitle()->getArticleID()
),
- __METHOD__,
- array( 'USE INDEX' => 'new_name_timestamp' )
+ __METHOD__
);
} else {
// Cache the information we gathered above in case we can't patrol
/**
* @param string $reason
* @param bool $suppress
- * @param int $id
- * @param bool $commit
+ * @param int $u1 Unused
+ * @param bool $u2 Unused
* @param string $error
* @return bool
*/
- public function doDeleteArticle( $reason, $suppress = false, $id = 0,
- $commit = true, &$error = ''
+ public function doDeleteArticle(
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = ''
) {
- return $this->mPage->doDeleteArticle( $reason, $suppress, $id, $commit, $error );
+ return $this->mPage->doDeleteArticle( $reason, $suppress, $u1, $u2, $error );
}
/**