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 "Avoid calling Block::deleteIfExpired() when not needed"
[lhc/web/wiklou.git]
/
includes
/
page
/
Article.php
diff --git
a/includes/page/Article.php
b/includes/page/Article.php
index
defd029
..
af1f00b
100644
(file)
--- a/
includes/page/Article.php
+++ b/
includes/page/Article.php
@@
-191,7
+191,7
@@
class Article implements Page {
}
/**
}
/**
- * Note that getContent
/loadContent do
not follow redirects anymore.
+ * Note that getContent
does
not follow redirects anymore.
* If you need to fetch redirectable content easily, try
* the shortcut in WikiPage::getRedirectTarget()
*
* If you need to fetch redirectable content easily, try
* the shortcut in WikiPage::getRedirectTarget()
*
@@
-212,7
+212,7
@@
class Article implements Page {
* Returns a Content object representing the pages effective display content,
* not necessarily the revision's content!
*
* Returns a Content object representing the pages effective display content,
* not necessarily the revision's content!
*
- * Note that getContent
/loadContent do
not follow redirects anymore.
+ * Note that getContent
does
not follow redirects anymore.
* If you need to fetch redirectable content easily, try
* the shortcut in WikiPage::getRedirectTarget()
*
* If you need to fetch redirectable content easily, try
* the shortcut in WikiPage::getRedirectTarget()
*
@@
-309,16
+309,6
@@
class Article implements Page {
return $oldid;
}
return $oldid;
}
- /**
- * Load the revision (including text) into this object
- *
- * @deprecated since 1.19; use fetchContent()
- */
- function loadContent() {
- wfDeprecated( __METHOD__, '1.19' );
- $this->fetchContent();
- }
-
/**
* Get text of an article from database
* Does *NOT* follow redirects.
/**
* Get text of an article from database
* Does *NOT* follow redirects.
@@
-696,7
+686,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
+1065,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
+1089,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;
}
@@
-1124,8
+1114,7
@@
class Article implements Page {
'rc_namespace' => $this->getTitle()->getNamespace(),
'rc_cur_id' => $this->getTitle()->getArticleID()
),
'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
);
} else {
// Cache the information we gathered above in case we can't patrol
@@
-2089,15
+2078,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 );
}
/**
}
/**