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
Special:Preferences Remove red box in email and changed confirm error to warning
[lhc/web/wiklou.git]
/
includes
/
page
/
Article.php
diff --git
a/includes/page/Article.php
b/includes/page/Article.php
index
4fdaea1
..
35621a4
100644
(file)
--- a/
includes/page/Article.php
+++ b/
includes/page/Article.php
@@
-696,7
+696,7
@@
class Article implements Page {
# Don't cache a dirty ParserOutput object
if ( $poolArticleView->getIsDirty() ) {
# Don't cache a dirty ParserOutput object
if ( $poolArticleView->getIsDirty() ) {
- $outputPage->set
Squid
Maxage( 0 );
+ $outputPage->set
Cdn
Maxage( 0 );
$outputPage->addHTML( "<!-- parser cache is expired, " .
"sending anyway due to pool overload-->\n" );
}
$outputPage->addHTML( "<!-- parser cache is expired, " .
"sending anyway due to pool overload-->\n" );
}
@@
-1075,7
+1075,6
@@
class Article implements Page {
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
- $cache = wfGetMainCache();
$rc = false;
if ( !$this->getTitle()->quickUserCan( 'patrol', $user )
$rc = false;
if ( !$this->getTitle()->quickUserCan( 'patrol', $user )
@@
-1100,7
+1099,8
@@
class Article implements Page {
}
// Check for cached results
}
// 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;
}
if ( $cache->get( $key ) ) {
return false;
}
@@
-2088,15
+2088,15
@@
class Article implements Page {
/**
* @param string $reason
* @param bool $suppress
/**
* @param string $reason
* @param bool $suppress
- * @param int $
i
d
- * @param bool $
commit
+ * @param int $
u1 Unuse
d
+ * @param bool $
u2 Unused
* @param string $error
* @return bool
*/
* @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 );
}
/**
}
/**