Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 16 insertions, 3 deletions

diff --git a/includes/filerepo/file/ForeignAPIFile.php b/includes/filerepo/file/ForeignAPIFile.php
index 3d5d5d60..3c78290c 100644
--- a/includes/filerepo/file/ForeignAPIFile.php
+++ b/includes/filerepo/file/ForeignAPIFile.php
@@ -219,11 +219,15 @@ class ForeignAPIFile extends File {
 	}
 
 	/**
-	 * @param string $method
+	 * @param string $type
 	 * @return int|null|string
 	 */
-	public function getUser( $method = 'text' ) {
-		return isset( $this->mInfo['user'] ) ? strval( $this->mInfo['user'] ) : null;
+	public function getUser( $type = 'text' ) {
+		if ( $type == 'text' ) {
+			return isset( $this->mInfo['user'] ) ? strval( $this->mInfo['user'] ) : null;
+		} elseif ( $type == 'id' ) {
+			return 0; // What makes sense here, for a remote user?
+		}
 	}
 
 	/**
@@ -365,4 +369,13 @@ class ForeignAPIFile extends File {
 		# Clear out the thumbnail directory if empty
 		$this->repo->quickCleanDir( $dir );
 	}
+
+	/**
+	 * The thumbnail is created on the foreign server and fetched over internet
+	 * @since 1.25
+	 * @return bool
+	 */
+	public function isTransformedLocally() {
+		return false;
+	}
 }