From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 26 Oct 2015 18:13:58 +0000 (-0700)
Subject: filebackend: Remove some old Content-Disposition b/c code
X-Git-Tag: 1.31.0-rc.0~9213^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=8c4e6beaf396527b5f697811216aeb612f9ee679;p=lhc%2Fweb%2Fwiklou.git

filebackend: Remove some old Content-Disposition b/c code

Change-Id: I6af4a84bd549e2bfb1b110fa790f499d144f236b
---

diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php
index cd82ab1034..8d76e96b7a 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -375,11 +375,6 @@ abstract class FileBackend {
 		if ( empty( $opts['force'] ) ) { // sanity
 			unset( $opts['nonLocking'] );
 		}
-		foreach ( $ops as &$op ) {
-			if ( isset( $op['disposition'] ) ) { // b/c (MW 1.20)
-				$op['headers']['Content-Disposition'] = $op['disposition'];
-			}
-		}
 		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scope = $this->getScopedPHPBehaviorForOps(); // try to ignore client aborts
 		return $this->doOperationsInternal( $ops, $opts );
@@ -611,9 +606,6 @@ abstract class FileBackend {
 		}
 		foreach ( $ops as &$op ) {
 			$op['overwrite'] = true; // avoids RTTs in key/value stores
-			if ( isset( $op['disposition'] ) ) { // b/c (MW 1.20)
-				$op['headers']['Content-Disposition'] = $op['disposition'];
-			}
 		}
 		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scope = $this->getScopedPHPBehaviorForOps(); // try to ignore client aborts