X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesList.php;h=fbcbc358521de74599ab8616c06b8af4aa709b25;hb=4ecf24c6e08edb31b0244229e8da8f9fa9c6068c;hp=78078770b2620cbcd6225a25f597b91fbb1ace3d;hpb=0f80b077fc5a0c1618076fcec6bcd824d093aa79;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 78078770b2..fbcbc35852 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -23,7 +23,7 @@
  */
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\RevisionRecord;
 use Wikimedia\Rdbms\IResultWrapper;
 
 class ChangesList extends ContextSource {
@@ -161,6 +161,7 @@ class ChangesList extends ContextSource {
 	 */
 	private function preCacheMessages() {
 		if ( !isset( $this->message ) ) {
+			$this->message = [];
 			foreach ( [
 				'cur', 'diff', 'hist', 'enhancedrc-history', 'last', 'blocklink', 'history',
 				'semicolon-separator', 'pipe-separator' ] as $msg
@@ -716,7 +717,9 @@ class ChangesList extends ContextSource {
 			/** Check for rollback permissions, disallow special pages, and only
 			 * show a link on the top-most revision
 			 */
-			if ( $title->quickUserCan( 'rollback', $this->getUser() ) ) {
+			if ( MediaWikiServices::getInstance()->getPermissionManager()
+				->quickUserCan( 'rollback', $this->getUser(), $title )
+			) {
 				$rev = new Revision( [
 					'title' => $title,
 					'id' => $rc->mAttribs['rc_this_oldid'],