Skip to content
Snippets Groups Projects
Commit ae2333f5 authored by Oleksandr Karpenko's avatar Oleksandr Karpenko
Browse files

MAGETWO-51604: [TD] Add functionality to save image in custom folder

parent 5f149543
Branches
No related merge requests found
......@@ -41,7 +41,7 @@ class Favicon extends File
*
* @return string[]
*/
protected function _getAllowedExtensions()
public function getAllowedExtensions()
{
return ['ico', 'png', 'gif', 'jpg', 'jpeg', 'apng', 'svg'];
}
......
......@@ -134,7 +134,6 @@ class File extends BackendFile
protected function _getUploadDir()
{
$fieldConfig = $this->getFieldConfig();
/* @var $fieldConfig \Magento\Framework\Simplexml\Element */
if (!array_key_exists('upload_dir', $fieldConfig)) {
throw new \Magento\Framework\Exception\LocalizedException(
......@@ -142,9 +141,12 @@ class File extends BackendFile
);
}
$uploadDir = (string)$fieldConfig['upload_dir'];
if (is_array($fieldConfig['upload_dir'])) {
$uploadDir = $fieldConfig['upload_dir']['value'];
if (array_key_exists('scope_info', $fieldConfig['upload_dir']) && $fieldConfig['upload_dir']['scope_info']
if (
array_key_exists('scope_info', $fieldConfig['upload_dir'])
&& $fieldConfig['upload_dir']['scope_info']
) {
$uploadDir = $this->_appendScopeInfo($uploadDir);
}
......@@ -152,8 +154,6 @@ class File extends BackendFile
if (array_key_exists('config', $fieldConfig['upload_dir'])) {
$uploadDir = $this->_mediaDirectory->getRelativePath($uploadDir);
}
} else {
$uploadDir = (string)$fieldConfig['upload_dir'];
}
return $uploadDir;
......
......@@ -39,7 +39,7 @@ class Logo extends File
*
* @return string[]
*/
protected function _getAllowedExtensions()
public function getAllowedExtensions()
{
return ['jpg', 'jpeg', 'gif', 'png', 'svg'];
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment