Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 1 insertions, 35 deletions

diff --git a/includes/filerepo/FileRepoStatus.php b/includes/filerepo/FileRepoStatus.php
index 56848df2..67080b6f 100644
--- a/includes/filerepo/FileRepoStatus.php
+++ b/includes/filerepo/FileRepoStatus.php
@@ -24,41 +24,7 @@
 /**
  * Generic operation result class for FileRepo-related operations
  * @ingroup FileRepo
+ * @deprecated 1.25
  */
 class FileRepoStatus extends Status {
-	/**
-	 * Factory function for fatal errors
-	 *
-	 * @param FileRepo $repo
-	 * @return FileRepoStatus
-	 */
-	static function newFatal( $repo /*, parameters...*/ ) {
-		$params = array_slice( func_get_args(), 1 );
-		$result = new self( $repo );
-		call_user_func_array( array( &$result, 'error' ), $params );
-		$result->ok = false;
-
-		return $result;
-	}
-
-	/**
-	 * @param FileRepo|bool $repo Default: false
-	 * @param mixed $value
-	 * @return FileRepoStatus
-	 */
-	static function newGood( $repo = false, $value = null ) {
-		$result = new self( $repo );
-		$result->value = $value;
-
-		return $result;
-	}
-
-	/**
-	 * @param bool|FileRepo $repo
-	 */
-	function __construct( $repo = false ) {
-		if ( $repo ) {
-			$this->cleanCallback = $repo->getErrorCleanupFunction();
-		}
-	}
 }