X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=5d6435ee5c27aa0159092d833266a8877c3e5d5e;hb=18a57bf80585c5ff6a5ee7d41cedb871740cccb4;hp=defd029a253e326c9787e27dfb6f83f7bd3b2fe1;hpb=254b163a9605c5f2e92c7b76158a8e8166efbbce;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/Article.php b/includes/page/Article.php
index defd029a25..5d6435ee5c 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1075,7 +1075,6 @@ class Article implements Page {
 
 		$outputPage = $this->getContext()->getOutput();
 		$user = $this->getContext()->getUser();
-		$cache = wfGetMainCache();
 		$rc = false;
 
 		if ( !$this->getTitle()->quickUserCan( 'patrol', $user )
@@ -1100,7 +1099,8 @@ class Article implements Page {
 		}
 
 		// 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;
 		}
@@ -1124,8 +1124,7 @@ class Article implements Page {
 					'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
@@ -2089,15 +2088,15 @@ class Article implements Page {
 	/**
 	 * @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 );
 	}
 
 	/**