diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/filerepo/file/ArchivedFile.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/filerepo/file/ArchivedFile.php')
-rw-r--r-- | includes/filerepo/file/ArchivedFile.php | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); } } |