Skip to content

Commit

Permalink
Merge branch 'MDL-67031' of https://github.com/stronk7/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
snake committed Nov 20, 2019
2 parents 6e35779 + 9e458d8 commit 88b2d7b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions repository/s3/README_MOODLE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ Cloned from git://github.com/tpyo/amazon-s3-php-class.git

https://github.com/tpyo/amazon-s3-php-class
http://undesigned.org.za/2007/10/22/amazon-s3-php-class

Local changes applied:
(verify on each upgrade of the library if they have been applied
upstream. Remove the local changes if so)

MDL-67031 php74 compliance. Change curly to square braces.
2 changes: 1 addition & 1 deletion repository/s3/S3.php
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@ private function __responseHeaderCallback($curl, $data)
elseif ($header == 'Content-Type')
$this->response->headers['type'] = $value;
elseif ($header == 'ETag')
$this->response->headers['hash'] = $value{0} == '"' ? substr($value, 1, -1) : $value;
$this->response->headers['hash'] = $value[0] == '"' ? substr($value, 1, -1) : $value;
elseif (preg_match('/^x-amz-meta-.*$/', $header))
$this->response->headers[$header] = $value;
}
Expand Down

0 comments on commit 88b2d7b

Please sign in to comment.