Skip to content

Commit

Permalink
Merge pull request #5153 in SW/shopware from sw-18937/5.2/added-suppo…
Browse files Browse the repository at this point in the history
…rt-for-ftps to 5.2

* commit '436a799b73ee3044ef29c1232bb06098a5ab30ad':
  SW-18937 - Added support for ftps in rest-api
  • Loading branch information
OliverSkroblin committed Jun 30, 2017
2 parents 1034e23 + 436a799 commit c12c003
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions UPGRADE-5.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This changelog references changes done in Shopware 5.2 patch versions.
* Added guetzli media optimizer
* Renamed `Shopware.model.AttributeConfig` to `Shopware.apps.Base.model.AttributeConfig`
* Added new event `Shopware_Plugins_HttpCache_ContextCookieValue` to modify HttpCache Context-Cookie.
* Added support for uploading media with ftps in Rest-API

# 5.2.26

Expand Down
3 changes: 2 additions & 1 deletion engine/Shopware/Components/Api/Resource/Media.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Media extends Resource
const FILENAME_LENGTH = 200;

/**
* @return \Shopware\Models\Category\Repository
* @return \Shopware\Models\Media\Repository
*/
public function getRepository()
{
Expand Down Expand Up @@ -324,6 +324,7 @@ public function load($url, $baseFilename = null)
$urlArray['path'] = explode('/', $urlArray['path']);
switch ($urlArray['scheme']) {
case 'ftp':
case 'ftps':
case 'http':
case 'https':
case 'file':
Expand Down

0 comments on commit c12c003

Please sign in to comment.