From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 includes/filerepo/file/ArchivedFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes/filerepo/file/ArchivedFile.php')

diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php
index 1d454283..1aec4464 100644
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -485,7 +485,7 @@ class ArchivedFile {
 		if ( $type == 'text' ) {
 			return $this->user_text;
 		} elseif ( $type == 'id' ) {
-			return $this->user;
+			return (int)$this->user;
 		}
 
 		throw new MWException( "Unknown type '$type'." );
@@ -587,6 +587,6 @@ class ArchivedFile {
 		$this->load();
 
 		$title = $this->getTitle();
-		return Revision::userCanBitfield( $this->deleted, $field, $user, $title ? : null );
+		return Revision::userCanBitfield( $this->deleted, $field, $user, $title ?: null );
 	}
 }
-- 
cgit v1.2.2